Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64160 discussions

Check_MK Git: check_mk: Added 4 new checks dell_powerconnect_* by Chris Bowlby

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 642d1815fd37488804551c95682c4a0f74ea3ffc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=642d1815fd3748… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 7 12:26:17 2011 +0200 Added 4 new checks dell_powerconnect_* by Chris Bowlby --- ChangeLog | 3 +++ checks/dell_powerconnect_cpu | 2 +- checks/dell_powerconnect_fans | 12 ++++++------ checks/dell_powerconnect_psu | 14 +++++++------- checks/dell_powerconnect_temp | 36 ++++++++++++++++++------------------ 5 files changed, 35 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index 32e1fb8..bd39ef2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.1.11i4 + Checks & Agents: + * Added 4 new checks dell_powerconnect_* by Chris Bowlby + Multisite: * FIX: WATO filtered status GUIs did not update the title after changing the title of the file/folder in WATO diff --git a/checks/dell_powerconnect_cpu b/checks/dell_powerconnect_cpu index e3e34ed..bb8cb9f 100644 --- a/checks/dell_powerconnect_cpu +++ b/checks/dell_powerconnect_cpu @@ -66,7 +66,7 @@ def check_dell_powerconnect_cpu(item, params, info): [('load', '%d%%' % cpu_load, params[0], params[1], 0, 100), ('loadavg 60s', '%d%%' % int(oneminuteperc), params[0], params[1], 0, 100), ('loadavg 5m', '%d%%' % int(fiveminutesperc), params[0], params[1], 0, 100), - ]) + ]) return (3, "UNKNOWN - Invalid information in snmp data") diff --git a/checks/dell_powerconnect_fans b/checks/dell_powerconnect_fans index 11c8f32..f448330 100644 --- a/checks/dell_powerconnect_fans +++ b/checks/dell_powerconnect_fans @@ -42,7 +42,7 @@ # Status codes: # 1 => normal, # 2 => warning, -# 3 => critical, +# 3 => critical, # 4 => shutdown, # 5 => notPresent, # 6 => notFunctioning @@ -56,21 +56,21 @@ dell_powerconnect_fans_state_performance_map = { '1': 1, '2': 0, '3': 0, '4': 0, def inventory_dell_powerconnect_fans(checkname, info): inventory = [] for device_id, name, state in info: - if dell_powerconnect_fans_status_map[state] != 'notPresent': - inventory.append((name, None)) + if dell_powerconnect_fans_status_map[state] != 'notPresent': + inventory.append((name, None)) return inventory # The check for the states and details of each fan def check_dell_powerconnect_fans(item, _not_used, info): for device_id, name, state in info: - if name == item: + if name == item: dell_powerconnect_status = dell_powerconnect_fans_status_map[state] status = dell_powerconnect_fans_status2nagios_map[dell_powerconnect_status] return (status, '%s - Condition of FAN "%s" is %s' % (nagios_state_names[status], name, dell_powerconnect_status), [ - ("state", dell_powerconnect_fans_state_performance_map[state], "", 0, 0, 1), - ]) + ("state", dell_powerconnect_fans_state_performance_map[state], "", 0, 0, 1), + ]) return (3, "UNKNOWN - item not found in snmp data") diff --git a/checks/dell_powerconnect_psu b/checks/dell_powerconnect_psu index b2c5b30..ab1167a 100644 --- a/checks/dell_powerconnect_psu +++ b/checks/dell_powerconnect_psu @@ -41,7 +41,7 @@ # Status codes: # 1 => normal, # 2 => warning, -# 3 => critical, +# 3 => critical, # 4 => shutdown, # 5 => notPresent, # 6 => notFunctioning @@ -63,21 +63,21 @@ dell_powerconnect_psu_state_performance_map = { '1': 1, '2': 0, '3': 0, '4': 0, def inventory_dell_powerconnect_psu(checkname, info): inventory = [] for device_id, name, state, supply in info: - if dell_powerconnect_psu_status_map[state] != 'notPresent': - inventory.append((name, None)) + if dell_powerconnect_psu_status_map[state] != 'notPresent': + inventory.append((name, None)) return inventory # Check of the states of each PS unit. def check_dell_powerconnect_psu(item, _not_used, info): for device_id, name, state, supply in info: - if name == item: + if name == item: dell_powerconnect_status = dell_powerconnect_psu_status_map[state] status = dell_powerconnect_psu_status2nagios_map[dell_powerconnect_status] - + return (status, '%s - Condition of PSU "%s" is %s, with source %s' % (nagios_state_names[status], name, dell_powerconnect_status, dell_powerconnect_psu_supply_map[supply]), [ - ("state", dell_powerconnect_psu_state_performance_map[state], "", 0, 0, 1), - ]) + ("state", dell_powerconnect_psu_state_performance_map[state], "", 0, 0, 1), + ]) return (3, "UNKNOWN - item not found in snmp data") diff --git a/checks/dell_powerconnect_temp b/checks/dell_powerconnect_temp index a59c4a6..9ba66a3 100644 --- a/checks/dell_powerconnect_temp +++ b/checks/dell_powerconnect_temp @@ -37,7 +37,7 @@ # Status codes: # 1 => ok, # 2 => unavailable, -# 3 => nonoperational, +# 3 => nonoperational, # GENERAL MAPS: dell_powerconnect_temp_status_map = { '1': 'ok', '2': 'unavailable', '3': 'nonoperational' } @@ -51,30 +51,30 @@ dell_powerconnect_temp_default_values = (35, 40) def inventory_dell_powerconnect_temp(checkname, info): inventory = [] for temp, state in info: - # use default variable as parameter. Note the quotes! - inventory.append((None, "dell_powerconnect_temp_default_values")) + # use default variable as parameter. Note the quotes! + inventory.append((None, "dell_powerconnect_temp_default_values")) return inventory # Execute a check against each sensor. def check_dell_powerconnect_temp(item, params, info): warn, crit = params for temp, state in info: - status = 0 - dell_powerconnect_status = dell_powerconnect_temp_status_map[state] + status = 0 + dell_powerconnect_status = dell_powerconnect_temp_status_map[state] - if int(temp) >= crit: - import pprint; pprint.pprint(temp) - status = 2 - elif int(temp) >= warn: - status = 1 - else: - status = dell_powerconnect_temp_status2nagios_map[dell_powerconnect_status] - - return (status, '%s - The temperature sensor is currently (%s), and the current temperature is %sC' % - (nagios_state_names[status], dell_powerconnect_temp_status_map[state], temp), [ - ("state", dell_powerconnect_temp_sensor_state_performance_map[state], "", 0, 0, 1), - ("temperature", int(temp), warn, crit, 0, 200), - ]) + if int(temp) >= crit: + import pprint; pprint.pprint(temp) + status = 2 + elif int(temp) >= warn: + status = 1 + else: + status = dell_powerconnect_temp_status2nagios_map[dell_powerconnect_status] + + return (status, '%s - The temperature sensor is currently (%s), and the current temperature is %sC' % + (nagios_state_names[status], dell_powerconnect_temp_status_map[state], temp), [ + ("state", dell_powerconnect_temp_sensor_state_performance_map[state], "", 0, 0, 1), + ("temperature", int(temp), warn, crit, 0, 200), + ]) return (3, "UNKNOWN - item not found in snmp data")

13 years

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b6575304f4398db9c5cbb3fa90b5b611f99701c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6575304f4398d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 7 11:57:07 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years

Check_MK Git: check_mk: Multisite row selection works now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0c21f3b8684bae81de0fd2cd1d471fb233b05173 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c21f3b8684bae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 7 11:56:58 2011 +0200 Multisite row selection works now --- web/htdocs/check_mk.css | 1 + web/htdocs/js/check_mk.js | 165 +++++++++++++++++++++++++++++++----------- web/htdocs/wato.py | 13 +++- web/plugins/views/layouts.py | 14 +++- 4 files changed, 145 insertions(+), 48 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0c21f3b868…

13 years

Check_MK Git: check_mk: add new bug

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 78986e3a821cd7725717720a229ce1378954da5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78986e3a821cd7… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Sep 7 09:20:17 2011 +0200 add new bug --- .bugs/316 | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/.bugs/316 b/.bugs/316 new file mode 100644 index 0000000..77f0484 --- /dev/null +++ b/.bugs/316 @@ -0,0 +1,19 @@ +Title: more elegant handling of focus in multisite "command" tab +Component: multisite +Benefit: 6 +State: open +Cost: 3 +Date: 2011-09-07 09:19:44 +Class: phantasm + +when a user tabs over to "commands" to issue a downtime, enter a comment o +ge an issue the focus is per default on some rarely used field (downtime? enter +comment?). +it should be moved to acknowledge, at least +ideally, move the focus wander to the button related to the field that has recei +ved text +input. To follow in current ajaxed style, make it fancy and switch the bg colour + of the +text box to highlight where input has been made. + +colours ftw!

13 years

Check_MK Git: check_mk: Row selection in table works now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 540e8796aa83dd3164174595b270ed4e895ee8a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=540e8796aa83dd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 18:30:06 2011 +0200 Row selection in table works now --- web/htdocs/js/check_mk.js | 15 +++++++++++---- web/plugins/views/layouts.py | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 4a050ac..046d61f 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -1061,6 +1061,15 @@ function remove_selected_rows(row_num) { } } +function toggle_box(e, elem) { + var row_pos = g_selected_rows.indexOf(elem.name); + if(row_pos > -1) { + g_selected_rows.splice(row_pos, 1); + } else { + g_selected_rows.push(elem.name); + } +} + function toggle_row(e, elem) { if(!e) e = window.event; @@ -1089,12 +1098,10 @@ function toggle_row(e, elem) { // Yes: Unselect it checkbox.checked = false; g_selected_rows.splice(row_pos, 1); - alert('x'); } else { // No: Select it checkbox.checked = true; g_selected_rows.push(checkbox.name); - alert('x'); } if(e.stopPropagation) @@ -1186,8 +1193,8 @@ function table_init_rowselect(oTable) { else childs[i].checked = false; - childs[i].onclick = function(e) { - return toggle_row(e, this); + childs[i].onchange = function(e) { + toggle_box(e, this); }; iter_cells(childs[i], function(elem) { diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index db0fdef..73b07f4 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -34,7 +34,7 @@ def render_checkbox(view, row, num_tds): # value contains the number of columns of this datarow. This is # needed for hiliting the correct number of TDs html.write("<input type=checkbox name=\"%s\" value=%d />" % - (row_id(view, row), num_tds + 1)) + (row_id(view, row), num_tds + 1)) def render_checkbox_td(view, row, num_tds): html.write("<td class=checkbox>")

13 years

Check_MK Git: check_mk: row selection nearly complete

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3598bb9e3b7c3ffd964ad61c2aaa01cdfe24cb06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3598bb9e3b7c3f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 18:05:09 2011 +0200 row selection nearly complete --- web/htdocs/js/check_mk.js | 26 +++++++++++++++++++++----- web/plugins/views/layouts.py | 3 ++- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index a994865..4a050ac 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -1089,10 +1089,12 @@ function toggle_row(e, elem) { // Yes: Unselect it checkbox.checked = false; g_selected_rows.splice(row_pos, 1); + alert('x'); } else { // No: Select it checkbox.checked = true; g_selected_rows.push(checkbox.name); + alert('x'); } if(e.stopPropagation) @@ -1178,19 +1180,33 @@ function table_init_rowselect(oTable) { if(childs[i].type != 'checkbox') continue; + // Perform initial selections + if(g_selected_rows.indexOf(childs[i].name) > -1) + childs[i].checked = true; + else + childs[i].checked = false; + + childs[i].onclick = function(e) { + return toggle_row(e, this); + }; + iter_cells(childs[i], function(elem) { elem.onmouseover = function() { - highlight_row(this, true); + return highlight_row(this, true); }; elem.onmouseout = function() { - highlight_row(this, false); + return highlight_row(this, false); }; elem.onclick = function(e) { - toggle_row(e, this); + return toggle_row(e, this); }; // Disable selections in IE and then in mozilla - elem.onselectstart = function(e) {disable_selection(e);} - elem.onmousedown = function(e) {disable_selection(e);} + elem.onselectstart = function(e) { + return disable_selection(e); + }; + elem.onmousedown = function(e) { + return disable_selection(e); + }; elem = null; }); } diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index d9c4989..db0fdef 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -33,7 +33,8 @@ def init_rowselect(): def render_checkbox(view, row, num_tds): # value contains the number of columns of this datarow. This is # needed for hiliting the correct number of TDs - html.write("<input type=checkbox name=\"%s\" value=%d />" % (row_id(view, row), num_tds)) + html.write("<input type=checkbox name=\"%s\" value=%d />" % + (row_id(view, row), num_tds + 1)) def render_checkbox_td(view, row, num_tds): html.write("<td class=checkbox>")

13 years

Check_MK Git: check_mk: Next step to make row selections working again

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 26f402a63c0399b80f547001a1c711aa5efc2dc0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26f402a63c0399… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 17:44:18 2011 +0200 Next step to make row selections working again --- web/htdocs/js/check_mk.js | 242 ++++++++++++++++++++++++++++-------------- web/plugins/views/layouts.py | 2 +- 2 files changed, 164 insertions(+), 80 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=26f402a63c…

13 years

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7087e493b72e2d1466978691c4658092a9aaf9d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7087e493b72e2d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 17:46:13 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk Conflicts: web/plugins/views/layouts.py ---

13 years

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: fd9dbec5c998a08f3c4c941f551fa3f909a04901 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd9dbec5c998a0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 17:46:19 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years

Check_MK Git: check_mk: Show only selected rows during action

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a26176762457c825eee8f3e23f2503b959d50479 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a26176762457c8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 6 17:46:12 2011 +0200 Show only selected rows during action --- web/htdocs/views.py | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index e75f778..27c3205 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1359,6 +1359,9 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # Create URI with all actions variables removed backurl = html.makeuri([]) has_done_actions = do_actions(view, datasource["infos"][0], rows, backurl) + if type(has_done_actions) == list: + rows = has_done_actions + has_done_actions = False if 'C' in display_options: html.write("</td></tr>") except MKUserError, e: @@ -2170,6 +2173,11 @@ def nagios_host_service_action_command(what, dataset): nagios_command = ("[%d] " % int(time.time())) + command + "\n" return title, [nagios_command] + +# Returns: +# True -> Actions have been done +# False -> No actions done because now rows selected +# [...] new rows -> Rows actions (shall/have) be performed on def do_actions(view, what, rows, backurl): if not config.may("act"): html.show_error(_("You are not allowed to perform actions. If you think this is an error, " @@ -2194,7 +2202,7 @@ def do_actions(view, what, rows, backurl): title = nagios_action_command(what, action_rows[0])[0] # just get the title if not html.confirm(_("Do you really want to %s the following %d %ss?") % (title, len(action_rows), what)): - return False # no actions done + return action_rows # no actions done, but show only selected rows count = 0 for row in action_rows:

13 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits