Checkmk git commits September 2011

checkmk-commits@lists.checkmk.com

3 participants
125 discussions

Check_MK Git: check_mk: ipmi_sensors: correctly handle further positive status texts

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 10de26645d10d7d6b7e72d48a1a798cd8a4e8292 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10de26645d10d7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 7 16:16:41 2011 +0200 ipmi_sensors: correctly handle further positive status texts --- ChangeLog | 2 ++ checks/ipmi_sensors | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e005ba8..c3ef015 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ Checks & Agents: * Added 4 new checks dell_powerconnect_* by Chris Bowlby + * ipmi_sensors: correctly handle further positive status texts + (thanks to Sebastian Talmon) Multisite: * FIX: WATO filtered status GUIs did not update the title after changing diff --git a/checks/ipmi_sensors b/checks/ipmi_sensors index c468ed8..42e7b20 100644 --- a/checks/ipmi_sensors +++ b/checks/ipmi_sensors @@ -108,8 +108,12 @@ def check_freeipmi(item, _no_params, info): perfdata = [] else: perfdata = [ ("value", current, None, crit) ] - infotext = "Current value %.1f%s%s" % (current, unit, levelstext) - if status == "OK" or status.startswith("Fully_Redundant"): + infotext = "Current value %.1f%s%s" % (current, unit, levelstext) + if status == "OK" \ + or status == "Entity_Present" \ + or status.endswith("is_connected") \ + or status.endswith("Presence_detected") \ + or status.startswith("Fully_Redundant"): return (0, "OK - " + infotext, perfdata) else: return (2, "CRIT - " + infotext, perfdata)

13 years

Check_MK Git: check_mk: Updated hook api to draw custom link buttons in views

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e1c841b6ae6d0aa69ca09befbec324d14fc416db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1c841b6ae6d0a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 7 15:42:55 2011 +0200 Updated hook api to draw custom link buttons in views --- ChangeLog | 2 +- web/htdocs/views.py | 47 ++++++++++++++++++++++------------------------- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50e7586..e005ba8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,7 +29,7 @@ * Sort titles in views can be enabled by clicking on the whole cells now * Submitting the view editor via ENTER key saves the view now instead of try mode * Host comments have red backgrounded rows when host is down - * Implemented extra_custom_links to be used in views to register custom context links + * Implemented hook api to draw custom link buttons in views WATO: * Changed row selection in WATO to new row selection mechanism diff --git a/web/htdocs/views.py b/web/htdocs/views.py index fc9052b..61fbb50 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. import config, defaults, livestatus, htmllib, time, os, re, pprint, time, copy -import weblib +import weblib, traceback from lib import * from pagefunctions import * @@ -49,7 +49,7 @@ multisite_sorters = {} multisite_builtin_views = {} multisite_painter_options = {} ubiquitary_filters = [] # Always show this filters -extra_context_links = [] +view_hooks = {} # Load all view plugins def load_plugins(): @@ -1567,6 +1567,7 @@ def show_context_links(thisview, active_filters): # Show button to WATO, if permissions allow this if config.may("use_wato"): html.begin_context_buttons() + execute_hooks('buttons-begin') first = False host = html.var("host") if host: @@ -1621,32 +1622,11 @@ def show_context_links(thisview, active_filters): if first: first = False html.begin_context_buttons() + execute_hooks('buttons-begin') vars_values = [ (var, html.var(var)) for var in set(used_contextvars) ] html.context_button(view_linktitle(view), html.makeuri_contextless(vars_values + [("view_name", name)]), view.get("icon")) - # Add the plugin registered context links when the var requirements can be met - # custom context links can be registered in view plugins like this: - # - # def get_my_link_url(view): - # (...) - # return '/url/to/link/to' - # - # extra_context_links = [ - # ([], 'The Title', get_my_link_url, 'map'), - # ] - # - # The first element is a list of required var names to show this button - # The fourth element it the name of the icon (icon_<name>.png) - # - # The url render function needs to return the target URL as string but can - # also return None to disable this link for the current view - for needed_vars, title, url_func, icon in extra_context_links: - miss = [ v for v in needed_vars if v not in active_filter_vars ] - if miss: - break - url = url_func(view) - if url is not None: - html.context_button(title, url, icon) + execute_hooks('buttons-end') if not first: html.end_context_buttons() @@ -2257,6 +2237,23 @@ def page_message_and_forward(message, default_url, addhtml=""): # |_| |_|\__,_|\__, |_|_| |_| |_| |_|\___|_| .__/ \___|_| |___/ # |___/ |_| +def register_hook(hook, func): + if not hook in view_hooks: + view_hooks[hook] = [func] + else: + view_hooks[hook].append(func) + +def execute_hooks(hook): + for hook_func in view_hooks[hook]: + try: + hook_func() + except: + if config.debug: + raise MKGeneralException(_('Problem while executing hook function %s in hook %s: %s') + % (hook_func.__name__, hook, traceback.format_exc())) + else: + pass + def prepare_paint(p, row): painter = p[0] linkview = p[1]

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: e6d7d709133e02790819ec6c0ec347e1b3f201e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6d7d709133e02… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 7 15:38:25 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: Fixed group row select on views without groupings

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f801c875ee9bd35d93b21a44cd23279dc0e6afc8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f801c875ee9bd3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 7 15:38:18 2011 +0200 Fixed group row select on views without groupings --- web/htdocs/js/check_mk.js | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 41ea146..76d2fb6 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -1169,7 +1169,7 @@ function toggle_group_rows(checkbox) { } if(group_start === null) - return; + group_start = 0; if(group_end === null) group_end = rows.length - 1; @@ -1190,7 +1190,7 @@ function toggle_group_rows(checkbox) { // container are highlighted. // It is also possible to give an array of DOM elements as parameter to toggle // all checkboxes below these objects. -function toggle_all_rows(obj, force_status) { +function toggle_all_rows(obj) { var checkboxes = get_all_checkboxes(obj || document); var all_selected = true; @@ -1199,7 +1199,7 @@ function toggle_all_rows(obj, force_status) { all_selected = false; // Toggle the state - if((typeof(force_status) !== 'undefined' && force_status) || all_selected) { + if(all_selected) { remove_selected_rows(checkboxes); } else { select_all_rows(checkboxes);

13 years

Check_MK Git: check_mk: Minor layout fixes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6238453d651a43ad862269a6ad5d5ec427e0d069 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6238453d651a43… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 7 15:30:39 2011 +0200 Minor layout fixes --- web/htdocs/check_mk.css | 9 +++++++++ web/plugins/views/layouts.py | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 8b5456c..166392c 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -663,6 +663,15 @@ table.data tr.data td.checkbox { width: 20px; text-align: center; } +table.data th input.checkgroup { + height: 12px; + width: 16px; + padding: 0; + margin: 0; + text-align: center; + vertical-align: middle; + font-size: 5pt; +} table.data td.host { border-style: none; diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 4f559ba..aa3030c 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -42,8 +42,8 @@ def render_checkbox_td(view, row, num_tds): html.write("</td>") def render_group_checkbox_th(): - html.write("<th><input type=button class=group name=_toggle_group" - " onclick=\"toggle_group_rows(this);\" value=\"%s\" /></th>" % _('x')) + html.write("<th><input type=button class=checkgroup name=_toggle_group" + " onclick=\"toggle_group_rows(this);\" value=\"%s\" /></th>" % _('X')) # ------------------------------------------------------------------------- # ____ _ _

13 years

Check_MK Git: check_mk: Nagios: use hostgroups instead of host_groups

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e73f711b5bf09b42bfd9ff2746ba8b995e7208c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e73f711b5bf09b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 7 14:22:28 2011 +0200 Nagios: use hostgroups instead of host_groups This fixes a problem when using Shinken --- ChangeLog | 4 ++++ modules/check_mk.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e1a49c..50e7586 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ 1.1.11i4 + Core, Setup, etc.: + * FIX: use hostgroups instead of host_groups in Nagios configuration. + This fixes a problem with Shinken + Checks & Agents: * Added 4 new checks dell_powerconnect_* by Chris Bowlby diff --git a/modules/check_mk.py b/modules/check_mk.py index 642449b..899458c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1390,7 +1390,7 @@ def create_nagios_hostdefs(outfile, hostname): hostgroups_to_define.add(default_host_group) elif define_hostgroups: hostgroups_to_define.update(hgs) - outfile.write(" host_groups\t\t\t+%s\n" % hostgroups) + outfile.write(" hostgroups\t\t\t+%s\n" % hostgroups) # Contact groups cgrs = host_contactgroups_of([hostname]) @@ -1452,7 +1452,7 @@ def create_nagios_hostdefs(outfile, hostname): hostgroups_to_define.add(default_host_group) elif define_hostgroups: hostgroups_to_define.update(hgs) - outfile.write(" host_groups\t\t\t+%s\n" % hostgroups) + outfile.write(" hostgroups\t\t\t+%s\n" % hostgroups) # host gets same contactgroups as real host if len(cgrs) > 0:

13 years

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 638422a2f0cbdfe5f54c896fd752649060aa431b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=638422a2f0cbdf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 7 14:22:30 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years

Check_MK Git: check_mk: Changed select group checkbox to button

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5f0346e5d5ff76e06c6e1d8a046ee10ce733de22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f0346e5d5ff76… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 7 14:19:32 2011 +0200 Changed select group checkbox to button --- web/htdocs/js/check_mk.js | 13 ++++--------- web/plugins/views/layouts.py | 4 ++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 0b388b0..41ea146 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -1178,7 +1178,7 @@ function toggle_group_rows(checkbox) { for(var a = group_start; a < group_end; a++) if(rows[a].tagName === 'TR') group_rows.push(rows[a]); - toggle_all_rows(group_rows, !checkbox.checked); + toggle_all_rows(group_rows); group_rows = null; tbody = null; @@ -1194,12 +1194,9 @@ function toggle_all_rows(obj, force_status) { var checkboxes = get_all_checkboxes(obj || document); var all_selected = true; - for(var i = 0; i < checkboxes.length && all_selected == true; i++) { - checkboxes[i].parentNode.backgroundColor = '#000000'; - checkboxes[i].parentNode.parentNode.backgroundColor = '#000000'; + for(var i = 0; i < checkboxes.length && all_selected == true; i++) if(g_selected_rows.indexOf(checkboxes[i].name) === -1) all_selected = false; - } // Toggle the state if((typeof(force_status) !== 'undefined' && force_status) || all_selected) { @@ -1249,11 +1246,9 @@ function get_all_checkboxes(container) { for(var i = 0; i < container.length; i++) { var childs = container[i].getElementsByTagName('input'); - for(var a = 0; a < childs.length; a++) { - if(childs[a].type == 'checkbox' && childs[a].className != 'group') { + for(var a = 0; a < childs.length; a++) + if(childs[a].type == 'checkbox') checkboxes.push(childs[a]); - } - } childs = null; } diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index f519a5d..4f559ba 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -42,8 +42,8 @@ def render_checkbox_td(view, row, num_tds): html.write("</td>") def render_group_checkbox_th(): - html.write("<th><input type=checkbox class=group name=_toggle_group" - " onclick=\"toggle_group_rows(this);\" /></th>") + html.write("<th><input type=button class=group name=_toggle_group" + " onclick=\"toggle_group_rows(this);\" value=\"%s\" /></th>" % _('x')) # ------------------------------------------------------------------------- # ____ _ _

13 years

Check_MK Git: check_mk: Fix reload problem during actions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8a3d20c265cf0d0c156ca17aa1c9144fcbb5cab9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a3d20c265cf0d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 7 13:16:07 2011 +0200 Fix reload problem during actions --- web/htdocs/js/check_mk.js | 1 + web/htdocs/views.py | 33 +++++++++++++++++---------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index f98b851..0b388b0 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -731,6 +731,7 @@ function handleReload(url) { // parameter selected_rows with the current selected rows as value. // otherwhise clear the parameter params['selected_rows'] = g_selected_rows.join(','); + params['_do_actions'] = getUrlParam('_do_actions') var url = makeuri(params); display_options = null; diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 27c3205..fc9052b 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1352,6 +1352,11 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # Actions if len(rows) > 0: + # If we are currently within an action (confirming or executing), then + # we display only the selected rows (if checkbox mode is active) + if html.var("selected_rows", "") and html.do_actions(): + rows = get_selected_rows(view, rows, html.var("selected_rows")) + if html.do_actions() and html.transaction_valid(): # submit button pressed, no reload try: if 'C' in display_options: @@ -1359,9 +1364,6 @@ 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: @@ -1389,7 +1391,8 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru if not has_done_actions: # Limit exceeded? Show warning html.check_limit(rows, get_limit()) - layout["render"](rows, view, group_painters, painters, num_columns, show_checkboxes) + layout["render"](rows, view, group_painters, painters, num_columns, + show_checkboxes and not html.do_actions()) # Play alarm sounds, if critical events have been displayed if 'S' in display_options and view.get("play_sounds"): @@ -2174,26 +2177,24 @@ def nagios_host_service_action_command(what, dataset): return title, [nagios_command] +def get_selected_rows(view, rows, sel_var): + action_rows = [] + selected_rows = sel_var.split(',') + for row in rows: + if row_id(view, row) in selected_rows: + action_rows.append(row) + return action_rows + # 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): +def do_actions(view, what, action_rows, backurl): if not config.may("act"): html.show_error(_("You are not allowed to perform actions. If you think this is an error, " "please ask your administrator grant you the permission to do so.")) return False # no actions done - # Handle optional row filter based on row selections - if html.has_var('selected_rows'): - selected_rows = html.var('selected_rows') - action_rows = [] - for row in rows: - if row_id(view, row) in selected_rows.split(','): - action_rows.append(row) - else: - action_rows = rows - if not action_rows: html.show_error(_("No rows selected to perform actions for.")) return False # no actions done @@ -2202,7 +2203,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 action_rows # no actions done, but show only selected rows + return False count = 0 for row in action_rows:

13 years

Check_MK Git: check_mk: FIX: fix compile error in Livestatus (TableLog.cc)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f7071fdf1fab77b2e35220fea2dad68dea17f873 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7071fdf1fab77… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 7 12:39:44 2011 +0200 FIX: fix compile error in Livestatus (TableLog.cc) --- ChangeLog | 3 +++ livestatus/src/TableLog.cc | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd39ef2..4e1a49c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,9 @@ * Bulk action buttons are shown at the top of hostlists too when the lists have more than 10 list items + Livestatus: + * FIX: fix compile error in TableLog.cc by including stddef.h + 1.1.11i3: Core, Setup, etc.: * FIX: allow host names to have spaces diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index 13b277a..912c2a9 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -26,6 +26,8 @@ #include <sys/types.h> #include <dirent.h> #include <unistd.h> +#include <stddef.h> + #include "nagios.h" #include "logger.h" #include "TableLog.h"

13 years

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2011