Checkmk git commits November 2013

checkmk-commits@lists.checkmk.com

6 participants
274 discussions

Check_MK Git: check_mk: FIX Cleaned up bad code in fileinfo.groups check

by Lars Michelsen

Module: check_mk Branch: master Commit: 3620534fa09f3466cf6e3426552b4b274c764f03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3620534fa09f34… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 12 13:17:34 2013 +0100 FIX Cleaned up bad code in fileinfo.groups check --- .werks/209 | 8 ++++++++ ChangeLog | 1 + checks/fileinfo | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.werks/209 b/.werks/209 new file mode 100644 index 0000000..e79d4cc --- /dev/null +++ b/.werks/209 @@ -0,0 +1,8 @@ +Title: Cleaned up bad code in fileinfo.groups check +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1384258634 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index e883fd5..6344b76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ * 0024 FIX: cisco_wlc: removed configuration parameter ap_model * 0065 FIX: veeam_client: check behaviour improved when backup is in progress * 0066 FIX: veeam_jobs: check behaviour improved when backup is in progress + * 0209 FIX: Cleaned up bad code in fileinfo.groups check Multisite: * 0001 New filters for selecting several host/service-groups at once... diff --git a/checks/fileinfo b/checks/fileinfo index 023ff92..df28a08 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -164,17 +164,17 @@ def check_fileinfo_groups(item, params, info): return fileinfo_check_function(check_definition, params) def fileinfo_check_function(check_definition, params): + import operator state = 0 infos = [] perfdata = [] for what, val, verbfunc in check_definition: infos.append("%s is %s" % (what, verbfunc(val))) warn, crit = "", "" - for how, comp in [ ("min", "<" ), ("max", ">") ]: + for how, comp, cfunc in [ ("min", "<", operator.lt), ("max", ">", operator.gt) ]: p = params.get(how + what) if p: warn, crit = p - cfunc = eval("lambda a,b: a %s b" % comp) if cfunc(val, crit): state = 2 infos[-1] += " (%s %s)(!!)" % (comp, verbfunc(crit))

10 years, 10 months

Check_MK Git: check_mk: Cleaned up byte format helpers - use get_filesize_human_readable really only for files

by Lars Michelsen

Module: check_mk Branch: master Commit: 1ec1aa32928957b3e12eddea4602841e333c9367 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ec1aa32928957… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 12 10:48:35 2013 +0100 Cleaned up byte format helpers - use get_filesize_human_readable really only for files --- checks/cisco_mem | 4 ++-- checks/netapp_fcpio | 4 ++-- modules/check_mk_base.py | 7 +++++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/checks/cisco_mem b/checks/cisco_mem index cc1199c..9034ebe 100644 --- a/checks/cisco_mem +++ b/checks/cisco_mem @@ -50,7 +50,7 @@ def check_cisco_mem_sub(params, mem_used, mem_total): if type(warn) == float: infotext = "%2.1f%% (%s) of %s used" % \ - (perc_used, get_filesize_human_readable(mem_used), get_filesize_human_readable(mem_total)) + (perc_used, get_bytes_human_readable(mem_used), get_bytes_human_readable(mem_total)) if perc_used >= crit: return (2, infotext + " (critical at %d%%)" % crit, perfdata) elif perc_used >= warn: @@ -59,7 +59,7 @@ def check_cisco_mem_sub(params, mem_used, mem_total): return (0, infotext, perfdata) else: infotext = "%s (%2.1f%%) of %s used" % \ - (get_filesize_human_readable(mem_used), perc_used, get_filesize_human_readable(mem_total)) + (get_bytes_human_readable(mem_used), perc_used, get_bytes_human_readable(mem_total)) if mem_used >= crit: return (2, infotext + " (critical at %s MB)" % crit, perfdata) elif mem_used >= warn: diff --git a/checks/netapp_fcpio b/checks/netapp_fcpio index 3e474c4..af7b952 100644 --- a/checks/netapp_fcpio +++ b/checks/netapp_fcpio @@ -56,8 +56,8 @@ def check_netapp_fcpio(item, params, info): write_msg = ' (!!)' - infotext = "%s read%s, %s write%s in last %d sec" % (get_filesize_human_readable(avg_read), \ - read_msg, get_filesize_human_readable(avg_write), write_msg, timedif) + infotext = "%s read%s, %s write%s in last %d sec" % (get_bytes_human_readable(avg_read), \ + read_msg, get_bytes_human_readable(avg_write), write_msg, timedif) return(state, infotext, perfdata) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index b4db04e..a1a5f60 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1486,10 +1486,13 @@ def get_bytes_human_readable(b, base=1024.0, bytefrac=True, unit="B"): return '%s%.0f%s' % (prefix, b, unit) # Similar to get_bytes_human_readable, but optimized for file -# sizes +# sizes. Really only use this for files. We assume that for smaller +# files one wants to compare the exact bytes of a file, so the +# threshold to show the value as MB/GB is higher as the one of +# get_bytes_human_readable(). def get_filesize_human_readable(size): if size < 4 * 1024 * 1024: - return str(size) + return "%dB" % int(size) elif size < 4 * 1024 * 1024 * 1024: return "%.2fMB" % (float(size) / (1024 * 1024)) else:

10 years, 10 months

Check_MK Git: check_mk: fileinfo.groups: Added minimum/ maximum file size parameters

by Lars Michelsen

Module: check_mk Branch: master Commit: b361fb7c7154565b93480b1b2b4ca82ce41bb5a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b361fb7c715456… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 12 10:58:54 2013 +0100 fileinfo.groups: Added minimum/maximum file size parameters It is now possible to configure thresholds for the minimum and maximum file size of all files found with a file grouping pattern. --- .werks/208 | 9 +++++++++ ChangeLog | 1 + checkman/fileinfo.groups | 16 +++++++++++++++ checks/fileinfo | 26 +++++++++++++++++++----- web/plugins/wato/check_parameters.py | 36 ++++++++++++++++++++++++++++++++++ 5 files changed, 83 insertions(+), 5 deletions(-) diff --git a/.werks/208 b/.werks/208 new file mode 100644 index 0000000..f1eb56b --- /dev/null +++ b/.werks/208 @@ -0,0 +1,9 @@ +Title: fileinfo.groups: Added minimum/maximum file size parameters +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1384250251 +Class: feature + +It is now possible to configure thresholds for the minimum and maximum +file size of all files found with a file grouping pattern. diff --git a/ChangeLog b/ChangeLog index c68d710..e883fd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * 0080 Added new checks for Brocade NetIron MLX switching / routing devices... * 0091 apc_ats_output: new check for output measurements on APC ATS devices * 0068 check_sql: support for mssql databases included + * 0208 fileinfo.groups: Added minimum/maximum file size parameters... * 0024 FIX: cisco_wlc: removed configuration parameter ap_model * 0065 FIX: veeam_client: check behaviour improved when backup is in progress * 0066 FIX: veeam_jobs: check behaviour improved when backup is in progress diff --git a/checkman/fileinfo.groups b/checkman/fileinfo.groups index 5aa6d11..1c4eea8 100644 --- a/checkman/fileinfo.groups +++ b/checkman/fileinfo.groups @@ -37,6 +37,10 @@ examples: "maxage_oldest": (100, 120), "minage_newest": (10, 20), "maxage_newest": (30, 40), + "minsize_largest": (2048, 1024), + "maxsize_largest": (2048, 1024), + "minsize_largest": (10240, 20480), + "maxsize_largest": (10240, 20480), }, ALL_HOSTS, ["File group"]), ] @@ -74,6 +78,18 @@ parameters (dict): This check uses dictionary based {"maxage_newest"}: Pair of integers for the maximum file age in seconds for the newest file found with file group pattern. + {"minsize_smallest"}: Pair of integers for the minimum file + size in bytes for the smallest file found with the file group pattern. + + {"maxsize_smallest"}: Pair of integers for the maximum file + size in bytes for the smallest file found with the file group pattern. + + {"minsize_largest"}: Pair of integers for the minimum file + size in bytes for the largest file found with the file group pattern. + + {"maxsize_largest"}: Pair of integers for the maximum file + size in bytes for the largest file found with the file group pattern. + {"minsize"}: The minimum size for the aggregation of all files in bytes (pair of integers). diff --git a/checks/fileinfo b/checks/fileinfo index 5aa9008..023ff92 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -121,11 +121,20 @@ def check_fileinfo_groups(item, params, info): age_oldest = None age_newest = 0 size_all = 0 + size_smallest = None + size_largest = 0 # Start counting all values for line in info[1:]: for pattern in params['precompiled_patterns']: if fnmatch.fnmatch(line[0], pattern) and str(line[1]) != 'missing': - size_all += int(line[1]) + size = int(line[1]) + size_all += size + if size_smallest == None: + size_smallest = size + else: + size_smallest = min(size_smallest, size) + size_largest = max(size_largest, size) + age = reftime - int(line[2]) if age_oldest == None: # very first match age_oldest = age @@ -133,6 +142,7 @@ def check_fileinfo_groups(item, params, info): else: age_oldest = max(age_oldest, age) age_newest = min(age_newest, age) + count_all += 1 if age_oldest == None: @@ -140,10 +150,16 @@ def check_fileinfo_groups(item, params, info): # Start Checking check_definition = [ - ("age_oldest", age_oldest, get_age_human_readable), - ("age_newest", age_newest, get_age_human_readable), - ("count", count_all, saveint), - ("size", size_all, get_filesize_human_readable)] + ("age_oldest", age_oldest, get_age_human_readable), + ("age_newest", age_newest, get_age_human_readable), + ("count", count_all, saveint), + ("size", size_all, get_filesize_human_readable), + ] + + if size_smallest is not None: + check_definition.append(("size_smallest", size_smallest, get_filesize_human_readable)) + if size_largest != 0: + check_definition.append(("size_largest", size_largest, get_filesize_human_readable)) return fileinfo_check_function(check_definition, params) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 5260d38..e970bc3 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -969,6 +969,42 @@ register_check_parameters( ] ) ), + ("minsize_smallest", + Tuple( + title = _("Minimal size of smallest file"), + elements = [ + Filesize(title = _("Warning if below")), + Filesize(title = _("Critical if below")), + ] + ) + ), + ("maxsize_smallest", + Tuple( + title = _("Maximal size of smallest file"), + elements = [ + Filesize(title = _("Warning if below")), + Filesize(title = _("Critical if below")), + ] + ) + ), + ("minsize_largest", + Tuple( + title = _("Minimal size of largest file"), + elements = [ + Filesize(title = _("Warning if above")), + Filesize(title = _("Critical if above")), + ] + ) + ), + ("maxsize_largest", + Tuple( + title = _("Maximal size of largest file"), + elements = [ + Filesize(title = _("Warning if above")), + Filesize(title = _("Critical if above")), + ] + ) + ), ("minsize", Tuple( title = _("Minimal size"),

10 years, 10 months

Check_MK Git: check_mk: GUI Notify: Added notify method "popup" to really create popup windows

by Lars Michelsen

Module: check_mk Branch: master Commit: 23327145ebf6c678b3e5623c93ad2780af4a7203 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23327145ebf6c6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 12 15:33:07 2013 +0100 GUI Notify: Added notify method "popup" to really create popup windows The messages were named popups before, but were not really poups, as they were only shown at the bottom of the sidebar as small hints. Both functions are now available as notification methods. Popups will show up as alert windows and be marked as read after closing the alert window and hints are only shown at the bottom of the sidebar now. --- .werks/211 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/js/sidebar.js | 31 +++++++++++++++++++++++-------- web/htdocs/notify.py | 33 +++++++++++++++++++-------------- web/htdocs/sidebar.py | 22 ++++++++++++++++------ 5 files changed, 71 insertions(+), 28 deletions(-) diff --git a/.werks/211 b/.werks/211 new file mode 100644 index 0000000..1277341 --- /dev/null +++ b/.werks/211 @@ -0,0 +1,12 @@ +Title: GUI Notify: Added notify method "popup" to really create popup windows +Level: 1 +Component: multisite +Version: 1.2.3i7 +Date: 1384266662 +Class: feature + +The messages were named popups before, but were not really poups, as they were +only shown at the bottom of the sidebar as small hints. Both functions are now +available as notification methods. Popups will show up as alert windows and be +marked as read after closing the alert window and hints are only shown at the +bottom of the sidebar now. diff --git a/ChangeLog b/ChangeLog index 2b823af..938f481 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ Multisite: * 0001 New filters for selecting several host/service-groups at once... * 0050 New concept of favorite hosts and services plus matching filters and views... + * 0211 GUI Notify: Added notify method "popup" to really create popup windows... * 0043 FIX: LDAP: Improved error reporting during synchronisation... * 0044 FIX: LDAP: Fixed error with empty groups during non nested group sync... * 0045 FIX: LDAP: Fixed error when synchronizing non nested groups to roles diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 71009c1..62f57d9 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -940,6 +940,7 @@ function handle_update_messages(_unused, code) { var c = document.getElementById('messages'); if (c) { c.innerHTML = code; + executeJSbyObject(c); update_message_trigger(); } } @@ -955,12 +956,21 @@ function update_messages() { get_url('sidebar_get_messages.py', handle_update_messages); } +function get_hint_messages(c) { + var hints; + if (c.getElementsByClassName) + hints = c.getElementsByClassName('popup_msg'); + else + hints = document.getElementsByClassName('popup_msg', c); + return hints; +} + function update_message_trigger() { var c = document.getElementById('messages'); if (c) { var b = document.getElementById('msg_button'); - var num = c.children.length; - if (c.children.length > 0) { + var hints = get_hint_messages(c); + if (hints.length > 0) { // are there pending messages? make trigger visible b.style.display = 'inline'; @@ -972,7 +982,7 @@ function update_message_trigger() { b.appendChild(l); } - l.innerHTML = '' + c.children.length; + l.innerHTML = '' + hints.length; } else { // no messages: hide the trigger b.style.display = 'none'; @@ -980,13 +990,21 @@ function update_message_trigger() { } } +function mark_message_read(msg_id) { + get_url('sidebar_message_read.py?id=' + msg_id); + + // Update the button state + update_message_trigger(); +} + function read_message() { var c = document.getElementById('messages'); if (!c) return; // extract message from teh message container - var msg = c.children[0]; + var hints = get_hint_messages(c); + var msg = hints[0]; c.removeChild(msg); // open the next message in a window @@ -994,10 +1012,7 @@ function read_message() { // tell server that the message has been read var msg_id = msg.id.replace('message-', ''); - get_url('sidebar_message_read.py?id=' + msg_id); - - // Update the button state - update_message_trigger(); + mark_message_read(msg_id); } function message_close(msg_id) { diff --git a/web/htdocs/notify.py b/web/htdocs/notify.py index 664ba9e..061c483 100644 --- a/web/htdocs/notify.py +++ b/web/htdocs/notify.py @@ -27,7 +27,7 @@ import config, forms, time, lib, userdb from valuespec import * -def get_popup_messages(user_id = None): +def get_gui_messages(user_id = None): if user_id is None: user_id = config.user_id path = config.config_dir + "/" + user_id + '/messages.mk' @@ -47,23 +47,23 @@ def get_popup_messages(user_id = None): updated = True if updated: - save_popup_messages(messages) + save_gui_messages(messages) return messages -def delete_popup_message(msg_id): - messages = get_popup_messages() +def delete_gui_message(msg_id): + messages = get_gui_messages() for index, msg in enumerate(messages): if msg['id'] == msg_id: messages.pop(index) - save_popup_messages(messages) + save_gui_messages(messages) -def save_popup_messages(messages, user_id = None): +def save_gui_messages(messages, user_id = None): if user_id is None: user_id = config.user_id path = config.config_dir + "/" + user_id + '/messages.mk' make_nagios_directory(os.path.dirname(path)) - file(path, 'w').write(repr(messages)) + file(path, 'w').write(repr(messages) + "\n") loaded_with_language = False def load_plugins(): @@ -76,9 +76,13 @@ def load_plugins(): global notify_methods notify_methods = { - 'popup': { - 'title': _('Popup Message in the GUI'), - 'handler': notify_popup, + 'gui_popup': { + 'title': _('Popup Message in the GUI (shows up alert window)'), + 'handler': notify_gui_msg, + }, + 'gui_hint': { + 'title': _('Send hint to message inbox (bottom of sidebar)'), + 'handler': notify_gui_msg, }, } @@ -218,7 +222,8 @@ def page_notify(): # | |___/ |___/ | # +----------------------------------------------------------------------+ -def notify_popup(user_id, msg): - messages = get_popup_messages(user_id) - messages.append(msg) - save_popup_messages(messages, user_id) +def notify_gui_msg(user_id, msg): + messages = get_gui_messages(user_id) + if msg not in messages: + messages.append(msg) + save_gui_messages(messages, user_id) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 31ea29a..6322c19 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -155,17 +155,27 @@ def sidebar_head(): '</div>\n' % (_("Go to main overview"), config.start_url, defaults.check_mk_version)) def render_messages(): - for msg in notify.get_popup_messages(): - html.write('<div class="popup_msg" id="message-%s">' % msg['id']) - html.write('<a href="javascript:void(0)" class="close" onclick="message_close(\'%s\')">x</a>' % msg['id']) - html.write(html.attrencode(msg['text']).replace('\n', '<br />\n')) - html.write('</div>\n') + for msg in notify.get_gui_messages(): + if 'gui_hint' in msg['methods']: + html.write('<div class="popup_msg" id="message-%s">' % msg['id']) + html.write('<a href="javascript:void(0)" class="close" onclick="message_close(\'%s\')">x</a>' % msg['id']) + html.write(html.attrencode(msg['text']).replace('\n', '<br />\n')) + html.write('</div>\n') + if 'gui_popup' in msg['methods']: + html.javascript('alert(\'%s\'); mark_message_read("%s")' % + (html.attrencode(msg['text']).replace('\n', '\\n'), msg['id'])) def ajax_get_messages(): render_messages() def ajax_message_read(): - notify.delete_popup_message(html.var('id')) + try: + notify.delete_gui_message(html.var('id')) + html.write("OK") + except: + if config.debug: + raise + html.write("ERROR") def sidebar_foot(): html.write('<div id="side_footer">')

10 years, 10 months

Check_MK Git: check_mk: FIX LDAP: Fixed problem syncing contactgroups of a user with umlauts in CN

by Lars Michelsen

Module: check_mk Branch: master Commit: 8fdd78a2206a985a44d74d47157c3caba0502a28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fdd78a2206a98… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 12 14:03:21 2013 +0100 FIX LDAP: Fixed problem syncing contactgroups of a user with umlauts in CN --- .werks/210 | 8 ++++++++ ChangeLog | 1 + web/plugins/userdb/ldap.py | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.werks/210 b/.werks/210 new file mode 100644 index 0000000..a535af8 --- /dev/null +++ b/.werks/210 @@ -0,0 +1,8 @@ +Title: LDAP: Fixed problem syncing contactgroups of a user with umlauts in CN +Level: 1 +Component: multisite +Version: 1.2.3i7 +Date: 1384261370 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 6344b76..2b823af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ * 0203 FIX: Changed sidebar reload interval to be more random... * 0204 FIX: Reduced I/O on logins with access time recording or failed login counts... * 0206 FIX: Fixed logwatch permission check when using liveproxy... + * 0210 FIX: LDAP: Fixed problem syncing contactgroups of a user with umlauts in CN WATO: * 0053 New rule for configuring the display_name of a service... diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 92f4fd5..a73ca1d 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -532,7 +532,7 @@ def ldap_group_members(filters, filt_attr = 'cn', nested = False): for dn, obj in ldap_search(ldap_replace_macros(config.ldap_groupspec['dn']), filt, ['cn', member_attr]): groups[dn] = { 'cn' : obj['cn'][0], - 'members' : obj.get(member_attr, []), + 'members' : [ m.encode('utf-8') for m in obj[member_attr] ], } else: # Nested querying is more complicated. We have no option to simply do a query for group objects @@ -560,7 +560,7 @@ def ldap_group_members(filters, filt_attr = 'cn', nested = False): 'cn' : cn, } for user_dn, obj in ldap_search(ldap_replace_macros(config.ldap_userspec['dn']), filt, columns = ['dn']): - groups[dn]['members'].append(user_dn) + groups[dn]['members'].append(user_dn.encode('utf-8')) g_ldap_group_cache[cache_key] = groups return groups

10 years, 10 months

Check_MK Git: check_mk: Availability: fix case where no data is available in timeline

by Mathias Kettner

Module: check_mk Branch: master Commit: 5506b9a57cac1b8c67787d520f19ea7bb03562be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5506b9a57cac1b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 12 14:02:00 2013 +0100 Availability: fix case where no data is available in timeline --- web/plugins/views/availability.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 1773bd6..c2c29e3 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -640,6 +640,9 @@ def do_render_availability(rows, what, avoptions, timeline, timewarpcode): need_statistics = os_aggrs and os_states show_timeline = avoptions["show_timeline"] grouping = avoptions["grouping"] + timeline_rows = [] # Need this as a global variable if just one service is affected + total_duration = 0 + considered_duration = 0 # Note: in case of timeline, we have data from exacly one host/service for site_host, site_host_entry in by_host.iteritems():

10 years, 10 months

Check_MK Git: check_mk: FIX: fix encoding problem on GIT integration

by Mathias Kettner

Module: check_mk Branch: master Commit: 09fd09c86f610edd4188ad99997f90f66f08c02e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09fd09c86f610e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 25 10:13:07 2013 +0200 FIX: fix encoding problem on GIT integration --- ChangeLog | 1 + web/htdocs/wato.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b34bfca..3172976 100644 --- a/ChangeLog +++ b/ChangeLog @@ -105,6 +105,7 @@ * FIX: fixed setting for locking mode from 'ait' to 'wait' * FIX: avoid removal of tags from rules when not yet acknowledged * FIX: avoid need for apache restart when adding new service levels + * FIX: fix encoding problem on GIT integration Livestatus: * Removed "livecheck". It never was really stable. Nagios4 has something diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ac32bf7..078dae8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -372,13 +372,14 @@ def lock_exclusive(): def git_command(args): - command = "cd '%s' && git %s 2>&1" % (defaults.default_config_dir, " ".join(args)) + encoded_args = " ".join([ a.encode("utf-8") for a in args ]) + command = "cd '%s' && git %s 2>&1" % (defaults.default_config_dir, encoded_args) p = os.popen(command) output = p.read() status = p.close() if status != None: raise MKGeneralException(_("Error executing GIT command %s: %s") % - (command, output)) + (command.decode('utf-8'), output)) def shell_quote(s): return "'" + s.replace("'", "'\"'\"'") + "'"

10 years, 10 months

Check_MK Git: check_mk: Fixed stating of star char in yesterdays change

by Lars Michelsen

Module: check_mk Branch: master Commit: e04c1614bc043d0603406cf2e09a51c5351a31ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e04c1614bc043d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 12 10:25:16 2013 +0100 Fixed stating of star char in yesterdays change --- web/htdocs/html_mod_python.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 81d42b1..1a3b786 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -3,7 +3,7 @@ import htmllib import os, time, config, weblib, re import defaults -varname_regex = re.compile('^[\w\d_.%+-*]+$') +varname_regex = re.compile('^[\w\d_.%+-\\\*]+$') class html_mod_python(htmllib.html):

10 years, 10 months

Check_MK Git: check_mk: check_sql: support for mssql databases included

by Götz Golla

Module: check_mk Branch: master Commit: 2f9e5107cb9b7702f92a399ccdb402b6aa07429c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f9e5107cb9b77… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Nov 11 18:32:36 2013 +0100 check_sql: support for mssql databases included --- .werks/68 | 8 ++++++++ ChangeLog | 1 + checkman/check_sql | 4 ++-- doc/treasures/active_checks/check_sql | 24 +++++++++++++++--------- web/plugins/wato/active_checks.py | 3 ++- 5 files changed, 28 insertions(+), 12 deletions(-) diff --git a/.werks/68 b/.werks/68 new file mode 100644 index 0000000..b0bafb9 --- /dev/null +++ b/.werks/68 @@ -0,0 +1,8 @@ +Title: check_sql: support for mssql databases included +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1384191118 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 834def4..c68d710 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * 0090 apc_ats_status: New Check for monitoring APC Automatic Transfer Switches * 0080 Added new checks for Brocade NetIron MLX switching / routing devices... * 0091 apc_ats_output: new check for output measurements on APC ATS devices + * 0068 check_sql: support for mssql databases included * 0024 FIX: cisco_wlc: removed configuration parameter ap_model * 0065 FIX: veeam_client: check behaviour improved when backup is in progress * 0066 FIX: veeam_jobs: check behaviour improved when backup is in progress diff --git a/checkman/check_sql b/checkman/check_sql index 8591146..f969826 100644 --- a/checkman/check_sql +++ b/checkman/check_sql @@ -15,8 +15,8 @@ description: Otherwise the number ist treated as a Nagios state (0,1,2,3). State, text and the performance data are being returned. - The check works with MySQL, Postgresql and Oracle databases using the - python drivers MySQLdb, psycopg2 and cx_Oracle. For cx_Oracle the + The check works with MySQL, Postgresql, MSSQL and Oracle databases using the + python drivers MySQLdb, psycopg2, pymssqlm and cx_Oracle. For cx_Oracle the Oracle instantclient needs to be installed as well, and the LD_LIBRARY_PATH needs to be modified to point to the libclntsh.so of that package. diff --git a/doc/treasures/active_checks/check_sql b/doc/treasures/active_checks/check_sql index ac384d5..95a5464 100755 --- a/doc/treasures/active_checks/check_sql +++ b/doc/treasures/active_checks/check_sql @@ -48,7 +48,7 @@ OPTIONS: -p PASS, --password PASS Password for database access -d DBMS, --dbms DBMS Name of the database management system. Default is 'postgres', other valid values are - 'mysql' and 'oracle' + 'mysql', 'mssql' and 'oracle' -H HOST, --hostname HOST Hostname or IP-Address where the database lives. Default is '127.0.0.1' -P PORT, --port PORT Port used to connect to the database -n NAME, --name NAME Name of the database on the DBMS @@ -162,6 +162,14 @@ try: db_connection = db.connect(host=opt_hostname, port=opt_port, \ db=opt_name, user=opt_user, passwd=opt_password ) + elif opt_dbms == "mssql": + import pymssql # mssql driver + db = pymssql + if opt_port == None: + opt_port=1433 + db_connection = db.connect(host=opt_hostname+":"+opt_port, \ + database=opt_name, user=opt_user, passwd=opt_password ) + elif opt_dbms == "oracle": sys.path.append('/usr/lib/python2.7/site-packages') import cx_Oracle @@ -197,10 +205,11 @@ try: outvar = cursor.var(cx_Oracle.STRING) #opt_input.append("outvar") cursor.callproc(opt_sql, (outvar,)) - result = outvar.getvalue() + res = outvar.getvalue() + result = res[0].split(",") else: cursor.execute(opt_sql) - result = cursor.fetchmany(2) + result = cursor.fetchone() cursor.close() db_connection.close() @@ -227,14 +236,11 @@ try: print "UNKNOWN - SQL statement/procedure returned no data" sys.exit(3) - #row = result[0] - row = result[0].split(",") - number = float(row[0]) - text = str(row[1]) + number = float(result[0]) + text = str(result[1]) try: - perf = row[2] - perf = "|"+row[2] + perf = "|"+str(result[2]) except IndexError: if opt_debug: raise diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 4b1ccb9..85e09d8 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -248,9 +248,10 @@ register_rule(group, choices = [ ( "mysql", _("MySQL") ), ( "postgres", _("PostgreSQL") ), + ( "mssql", _("MSSQL") ), ( "oracle", _("Oracle") ), ], - default_value = "mysql", + default_value = "postgres", ), ), ( "port",

10 years, 10 months

Check_MK Git: check_mk: livedump: new option to mark the mode at the beginning of the dump and documentation fixes

by Götz Golla

Module: check_mk Branch: master Commit: 1f9fb2a4a1c5e385da656891319c80f1a8ffc405 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f9fb2a4a1c5e3… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Nov 11 16:52:36 2013 +0100 livedump: new option to mark the mode at the beginning of the dump and documentation fixes livedump now has an option to mark the mode of the dump (config or status) in the first line of the dump to be read by the livedump receiver livedump-ssh-recv --- .werks/67 | 9 +++++++++ ChangeLog | 1 + doc/treasures/livedump/README | 4 ++-- doc/treasures/livedump/livedump | 15 +++++++++++++-- doc/treasures/livedump/livedump-ssh-recv | 2 +- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/.werks/67 b/.werks/67 new file mode 100644 index 0000000..a8bd992 --- /dev/null +++ b/.werks/67 @@ -0,0 +1,9 @@ +Title: livedump: new option to mark the mode at the beginning of the dump and documentation fixes +Level: 1 +Component: livestatus +Version: 1.2.3i7 +Date: 1384184962 +Class: feature + +livedump now has an option to mark the mode of the dump (config or status) in the first +line of the dump to be read by the livedump receiver livedump-ssh-recv diff --git a/ChangeLog b/ChangeLog index 74ee996..73fbc7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ * 0026 FIX: snmpd_mkevent.py: fixed crash on startup Livestatus: + * 0067 livedump: new option to mark the mode at the beginning of the dump and documentation fixes... * 0023 FIX: table statehist: code cleanup / minor performance improvements diff --git a/doc/treasures/livedump/README b/doc/treasures/livedump/README index 797adb2..3f478ab 100644 --- a/doc/treasures/livedump/README +++ b/doc/treasures/livedump/README @@ -30,10 +30,10 @@ NSCA users will now this. This is easily done by: ./livedump -TC > some_file.cfg and then copying that file to your objects or conf.d directory on -your target nagios. Note: The option -C will add some templates +your target nagios. Note: The option -T will add some templates to the configuration that are used by the created host and service definitions. If you import data from more than on source those -template will be duplicate. Use -T in that case in order to avoid +template will be duplicate. Use -C only in that case in order to avoid duplication. Now restart your target system and new hosts and services will appear diff --git a/doc/treasures/livedump/livedump b/doc/treasures/livedump/livedump index b784262..ad391cc 100755 --- a/doc/treasures/livedump/livedump +++ b/doc/treasures/livedump/livedump @@ -33,9 +33,11 @@ def dump_templates(): sys.stdout.write(""" define host { name livedump-host + use check_mk_default register 0 active_checks_enabled 0 passive_checks_enabled 1 + } define service { @@ -226,6 +228,8 @@ def usage(): -h, --help Show this cruft -V, --version Show version and exit -T, --dump-templates Also dump host/service templates + -M, --mark-mode Puts the mode (state/configuration dump) in the first + line for use with livedump-ssh-recv and similar scripts -s, --socket S connect to Livestatus-socket at S -s tcp:10.11.0.55:6557 @@ -255,14 +259,15 @@ def print_version(): # | Main entry point, getopt, etc. | # '----------------------------------------------------------------------' -short_options = 'hVvc:H:S:O:TC' +short_options = 'hVvc:H:S:O:TCM' long_options = [ "help", "version", "verbose", "debug", "socket=", "host-header=", "host-only-header=", "service-header=", - "dump-templates", "config", "state" ] + "dump-templates", "config", "state", "mark-mode" ] opt_verbose = False opt_debug = False opt_socket = None +opt_mark_mode = False opt_host_headers = "" opt_host_only_headers = "" opt_service_headers = "" @@ -299,6 +304,8 @@ for o,a in opts: opt_service_headers += a + "\n" elif o in [ '-T', '--dump-templates' ]: opt_dump_templates = True + elif o in [ '-M', '--mark-mode' ]: + opt_mark_mode = True # Main modes @@ -306,8 +313,12 @@ try: connect() for o, a in opts: if o in [ '-C', '--config' ]: + if opt_mark_mode: + print "config" livedump_config() sys.exit(0) + if opt_mark_mode: + print "status" livedump_state() except Exception, e: diff --git a/doc/treasures/livedump/livedump-ssh-recv b/doc/treasures/livedump/livedump-ssh-recv old mode 100644 new mode 100755 index b8d69ae..7d76172 --- a/doc/treasures/livedump/livedump-ssh-recv +++ b/doc/treasures/livedump/livedump-ssh-recv @@ -4,7 +4,7 @@ # a) a header (specificing if its the configuration or status info) # b) the real data as generated by livedump # -# When the first line contains the string "state", the following lines +# When the first line contains the string "status", the following lines # are all treated as checkresult information. If the line contains the # string "config", the following lines are treated as nagios configuration # definitions. All chars after the config string in the subject are used

10 years, 10 months

← Newer
1
...
15
16
17
18
19
20
21
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2013