Checkmk git commits December 2012

checkmk-commits@lists.checkmk.com

3 participants
128 discussions

Check_MK Git: check_mk: Remove superflous import

by Mathias Kettner

Module: check_mk Branch: master Commit: b00ff72e66ef4496575870fc9e6e272706727871 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b00ff72e66ef44… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 18 17:45:19 2012 +0100 Remove superflous import --- web/plugins/wato/check_mk_configuration.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index df72f2c..f546681 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -270,8 +270,6 @@ register_configvar(group, # | |___/ | # +----------------------------------------------------------------------+ -import userdb - group = _("User Management") register_configvar(group,

11 years, 9 months

Check_MK Git: check_mk: EC: FIX: fix bug in Filter "Hostname/

by Mathias Kettner

IP-Address of original event" Message-ID: <50d07bad.5lq07lJxXXyW7n0P%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 1ad9ccee0f7b79956e12dc15990231d8c9fc471d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ad9ccee0f7b79… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 18 15:20:25 2012 +0100 EC: FIX: fix bug in Filter "Hostname/IP-Address of original event" --- ChangeLog | 1 + mkeventd/web/plugins/views/mkeventd.py | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c79d77..cd1e07d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ * FIX: fix exception in rules that use facility local7 * FIX: fix event icon in case of using TCP access to EC * FIX: Allowing ":" in application field (e.g. needed for windows logfiles) + * FIX: fix bug in Filter "Hostname/IP-Address of original event" * Replication slave can now copy rules from master into local configuration via a new button in WATO. * Speedup access to event history by earlier filtering and prefiltering with grep diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index 8dc44ee..7f36c7e 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -201,8 +201,8 @@ if mkeventd_enabled: # returns header lines for the event daemon, if the filter is in # use. class EventFilterText(FilterText): - def __init__(self, table, name, title, op): - FilterText.__init__(self, name, title, table, name, name, op) + def __init__(self, table, filter_name, column, title, op): + FilterText.__init__(self, filter_name, title, table, column, filter_name, op) self._table = table # Disable Livestatus filter @@ -212,17 +212,17 @@ if mkeventd_enabled: def event_headers(self): return FilterText.filter(self, self._table) - declare_filter(200, EventFilterText("event", "event_id", _("Event ID"), "=")) - declare_filter(200, EventFilterText("event", "event_rule_id", _("ID of rule"), "=")) - declare_filter(201, EventFilterText("event", "event_text", _("Message/Text of event"), "~~")) - declare_filter(201, EventFilterText("event", "event_application", _("Application / Syslog-Tag"), "~~")) - declare_filter(201, EventFilterText("event", "event_contact", _("Contact Person"), "~~")) - declare_filter(201, EventFilterText("event", "event_comment", _("Comment to the event"), "~~")) - declare_filter(201, EventFilterText("event", "event_host_regex", _("Hostname/IP-Address of original event"), "~~")) - declare_filter(201, EventFilterText("event", "event_host", _("Hostname/IP-Address of event, exact match"), "=")) - declare_filter(201, EventFilterText("event", "event_owner", _("Owner of event"), "~~")) - declare_filter(221, EventFilterText("history", "history_who", _("User that performed action"), "~~")) - declare_filter(222, EventFilterText("history", "history_line", _("Line number in history logfile"), "=")) + declare_filter(200, EventFilterText("event", "event_id", "event_id", _("Event ID"), "=")) + declare_filter(200, EventFilterText("event", "event_rule_id", "event_rule_id", _("ID of rule"), "=")) + declare_filter(201, EventFilterText("event", "event_text", "event_text", _("Message/Text of event"), "~~")) + declare_filter(201, EventFilterText("event", "event_application","event_application", _("Application / Syslog-Tag"), "~~")) + declare_filter(201, EventFilterText("event", "event_contact", "event_contact", _("Contact Person"), "~~")) + declare_filter(201, EventFilterText("event", "event_comment", "event_comment", _("Comment to the event"), "~~")) + declare_filter(201, EventFilterText("event", "event_host_regex", "event_host", _("Hostname/IP-Address of original event"), "~~")) + declare_filter(201, EventFilterText("event", "event_host", "event_host", _("Hostname/IP-Address of event, exact match"), "=")) + declare_filter(201, EventFilterText("event", "event_owner", "event_owner", _("Owner of event"), "~~")) + declare_filter(221, EventFilterText("history", "history_who", "history_who", _("User that performed action"), "~~")) + declare_filter(222, EventFilterText("history", "history_line", "history_line", _("Line number in history logfile"), "=")) class EventFilterCount(Filter):

11 years, 9 months

Check_MK Git: check_mk: Output better error message in case of old inventory function

by Mathias Kettner

Module: check_mk Branch: master Commit: acf970ba2ef742cd12f0a7f089fb2cc7c3cf11f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acf970ba2ef742… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 18 12:35:05 2012 +0100 Output better error message in case of old inventory function --- ChangeLog | 1 + modules/check_mk.py | 16 ++++++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0964dc2..5c79d77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ exception to status output and traceback to long output now. * Added HOSTTAGS to notification macros which contains all Check_MK-Tags separated by spaces + * Output better error message in case of old inventory function Notifications: * Fix flexible notifications on non-OMD systems diff --git a/modules/check_mk.py b/modules/check_mk.py index 8eeb594..4429a6c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -27,7 +27,7 @@ # This file is also read in by check_mk's web pages. In that case, # the variable check_mk_web is set to True -import os, sys, socket, time, getopt, glob, re, stat, py_compile, urllib +import os, sys, socket, time, getopt, glob, re, stat, py_compile, urllib, inspect # These variable will be substituted at 'make dist' time check_mk_version = '(inofficial)' @@ -2275,16 +2275,12 @@ def make_inventory(checkname, hostnamelist, check_only=False, include_state=Fals if info == None: # No data for this check type continue try: - # New preferred style since 1.1.11i3: only one argument: info - try: + # Check number of arguments of inventory function + if len(inspect.getargspec(inventory_function)[0]) == 2: + inventory = inventory_function(checkname, info) # inventory is a list of pairs (item, current_value) + else: + # New preferred style since 1.1.11i3: only one argument: info inventory = inventory_function(info) - except Exception, e: - # failed? Lets try pre-1.1.11i3 style inventory function - try: - inventory = inventory_function(checkname, info) # inventory is a list of pairs (item, current_value) - except Exception, ee: - # Let the first exception happen again - inventory_function(info) if inventory == None: # tolerate if function does no explicit return inventory = []

11 years, 9 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 7e8864a9efe32d8edca4d88066a8a89982c4a2cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e8864a9efe32d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 14 15:09:50 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 9 months

Check_MK Git: check_mk: userdb: Bugfix after code cleanups;

by Lars Michelsen

Users can now edit user_attributes on profile page Message-ID: <50cb330d.WPvpES/EZxwBWKEE%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: d9ebd1d404a8855fcf3fd7ee942c39e674dde13d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9ebd1d404a885… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 14 15:08:35 2012 +0100 userdb: Bugfix after code cleanups; Users can now edit user_attributes on profile page --- web/htdocs/default_permissions.py | 7 +++++ web/htdocs/wato.py | 45 ++++++++++++++++++++++++++---------- web/plugins/userdb/hook_auth.py | 3 +- 3 files changed, 41 insertions(+), 14 deletions(-) diff --git a/web/htdocs/default_permissions.py b/web/htdocs/default_permissions.py index d2c3a4c..c4a49b2 100644 --- a/web/htdocs/default_permissions.py +++ b/web/htdocs/default_permissions.py @@ -118,6 +118,13 @@ def load(): [ 'admin', 'user' ] ) + config.declare_permission('general.edit_user_attributes', + _('Edit personal user attributes'), + _('This allows a user to edit his personal user attributes. You also need the permission ' + '<i>Edit the user profile</i> in order to do this.'), + [ 'admin', 'user' ] + ) + config.declare_permission('general.change_password', _('Edit the user password'), _('Permits the user to change the password.'), diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index df9b101..8d4d97d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7504,9 +7504,10 @@ def delete_distributed_wato_file(): # | Mode for managing users and contacts. | # '----------------------------------------------------------------------' -def declare_user_attribute(name, vs): +def declare_user_attribute(name, vs, user_editable = True): userdb.user_attributes[name] = { - 'valuespec': vs, + 'valuespec': vs, + 'user_editable': user_editable, } def load_notification_scripts_from(adir): @@ -7977,9 +7978,9 @@ def mode_edit_user(phase): new_user["notification_method"] = value # Custom attributes - for name, vs in userdb.get_user_attributes(): - value = vs.from_html_vars('ua_' + name) - vs.validate_value(value, "ua_" + name) + for name, attr in userdb.get_user_attributes(): + value = attr['valuespec'].from_html_vars('ua_' + name) + attr['valuespec'].validate_value(value, "ua_" + name) new_user[name] = value # Saving @@ -8201,10 +8202,12 @@ def mode_edit_user(phase): forms.header(_("Personal Settings"), isopen = False) select_language(user.get('language', '')) - for name, vs in userdb.get_user_attributes(): - forms.section(vs.title()) - vs.render_input("ua_" + name, user.get(name, vs.default_value())) - html.help(vs.help()) + for name, attr in userdb.get_user_attributes(): + if attr['user_editable']: + vs = attr['valuespec'] + forms.section(vs.title()) + vs.render_input("ua_" + name, user.get(name, vs.default_value())) + html.help(vs.help()) # TODO: Later we could add custom macros here, which # then could be used for notifications. On the other hand, @@ -10814,10 +10817,19 @@ def page_user_profile(): # load the new language load_language(config.get_language()) - user = users.get(config.user_id) - if config.may('general.edit_notifications') and user.get("notifications_enabled"): - value = forms.get_input(vs_notification_method, "notification_method") - users[config.user_id]["notification_method"] = value + user = users.get(config.user_id) + if config.may('general.edit_notifications') and user.get("notifications_enabled"): + value = forms.get_input(vs_notification_method, "notification_method") + users[config.user_id]["notification_method"] = value + + # Custom attributes + if config.may('general.edit_user_attributes'): + for name, attr in userdb.get_user_attributes(): + if attr['user_editable']: + vs = attr['valuespec'] + value = vs.from_html_vars('ua_' + name) + vs.validate_value(value, "ua_" + name) + users[config.user_id][name] = value # Change the password if requested if config.may('general.change_password'): @@ -10894,6 +10906,13 @@ def page_user_profile(): vs_notification_method.render_input("notification_method", user.get("notification_method")) # forms.input(vs_notification_method, "notification_method", user.get("notification_method")) + if config.may('general.edit_user_attributes'): + for name, attr in userdb.get_user_attributes(): + vs = attr['valuespec'] + forms.section(vs.title()) + vs.render_input("ua_" + name, user.get(name, vs.default_value())) + html.help(vs.help()) + # Save button forms.end() html.button("_save", _("Save")) diff --git a/web/plugins/userdb/hook_auth.py b/web/plugins/userdb/hook_auth.py index c4aaaaf..04e3576 100644 --- a/web/plugins/userdb/hook_auth.py +++ b/web/plugins/userdb/hook_auth.py @@ -185,7 +185,8 @@ function may($username, $need_permission) { def create_auth_file(users): make_nagios_directory(g_auth_base_dir) - create_php_file(users, config.get_role_permissions(), get_folder_permissions_of_users(users)) + import wato # HACK: cleanup! + create_php_file(users, config.get_role_permissions(), wato.get_folder_permissions_of_users(users)) hooks.register('users-saved', create_auth_file) hooks.register('roles-saved', lambda x: create_auth_file(load_users()))

11 years, 9 months

Check_MK Git: check_mk: fileinfo / cpl_airlaiser no longer crash when no check info is given

by Andreas Boesl

Module: check_mk Branch: master Commit: d51a8235e2d73fafd731eafdff9fa310d7a32798 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d51a8235e2d73f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Dec 14 14:32:12 2012 +0100 fileinfo / cpl_airlaiser no longer crash when no check info is given --- checks/cbl_airlaser | 4 +++- checks/fileinfo | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/checks/cbl_airlaser b/checks/cbl_airlaser index 650bc58..41200e2 100644 --- a/checks/cbl_airlaser +++ b/checks/cbl_airlaser @@ -177,10 +177,12 @@ def inventory_cbl_airlaser(info): def check_cbl_airlaser_status(item, _no_params, info): + if len(info) == 0: + return (3, "UNKNOWN - no information sent by agent") + selftest, chassis, power, module, optrx, opttx = info status = selftest[0][0] - if status == "1": return (0, "OK - Airlaser: normal operation") elif status == "2": diff --git a/checks/fileinfo b/checks/fileinfo index 6086fce..0ab6760 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -76,6 +76,9 @@ def fileinfo_patterns_of_group(group): return patterns def check_fileinfo(item, params, info): + if len(info) == 0: + return (3, "UNKNOWN - no information sent by agent") + reftime = int(info[0][0]) check_definition = False for line in info[1:]: @@ -94,8 +97,11 @@ def check_fileinfo(item, params, info): return fileinfo_check_function(check_definition, params) def check_fileinfogroups(item, params, info): + if len(info) == 0: + return (3, "UNKNOWN - no information sent by agent") import fnmatch reftime = int(info[0][0]) + count_all = 0 age_oldest = None age_newest = 0

11 years, 9 months

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

by Andreas Boesl

Module: check_mk Branch: master Commit: bf3c36971c4db1604905caf004c802c6ebc7dcfe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf3c36971c4db1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Dec 14 14:36:35 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 9 months

Check_MK Git: check_mk: Removed debug output

by Lars Michelsen

Module: check_mk Branch: master Commit: 0b28d2dc56a28c28339634d7e3f19f3612f1ef9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b28d2dc56a28c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 14 14:24:01 2012 +0100 Removed debug output --- web/htdocs/userdb.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 3533ff5..51ca6b6 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -264,8 +264,6 @@ def split_dict(d, keylist, positive): def save_users(profiles): custom_values = user_attributes.keys() - file('/tmp/a', 'a').write('%d saving users (%s %r)\n' % (time.time(), html.req.myfile, html.req.vars)) - # Keys not to put into contact definitions for Check_MK non_contact_keys = [ "roles",

11 years, 9 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 3c7f8760e121e9d896d46afc77092b89fb02745d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c7f8760e121e9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 14 14:12:43 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 9 months

Check_MK Git: check_mk: ldap: Fixed locking problem in page sync hook

by Lars Michelsen

Module: check_mk Branch: master Commit: bffd95d061f3e43447c7cc66338f6c6e49356797 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bffd95d061f3e4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 14 14:11:35 2012 +0100 ldap: Fixed locking problem in page sync hook --- checkman/uptime | 2 +- web/htdocs/userdb.py | 2 ++ web/plugins/userdb/ldap.py | 10 ++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/checkman/uptime b/checkman/uptime index 914133f..2fa4d95 100644 --- a/checkman/uptime +++ b/checkman/uptime @@ -12,5 +12,5 @@ perfdata: The uptime in seconds. inventory: - One check per system is created if the agent has a action {<<<uptime>>>}. + One check per system is created if the agent has a section {<<<uptime>>>}. diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 51ca6b6..3533ff5 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -264,6 +264,8 @@ def split_dict(d, keylist, positive): def save_users(profiles): custom_values = user_attributes.keys() + file('/tmp/a', 'a').write('%d saving users (%s %r)\n' % (time.time(), html.req.myfile, html.req.vars)) + # Keys not to put into contact definitions for Check_MK non_contact_keys = [ "roles", diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index cf44790..44d8b6b 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -524,6 +524,10 @@ def ldap_login(username, password): return result def ldap_sync(add_to_changelog, only_username): + # Store time of the last sync. Don't store after sync since parallel + # requests to e.g. the page hook would cause duplicate calculations + file(g_ldap_sync_time_file, 'w').write('%s\n' % time.time()) + ldap_connect() # Unused at the moment, always sync all users @@ -572,7 +576,8 @@ def ldap_sync(add_to_changelog, only_username): users[user_id] = user # Update the user record if mode_create: - wato.log_pending(wato.SYNCRESTART, None, "edit-users", _("LDAP Connector: Created user %s" % user_id)) + wato.log_pending(wato.SYNCRESTART, None, "edit-users", + _("LDAP Connector: Created user %s" % user_id)) else: wato.log_pending(wato.SYNCRESTART, None, "edit-users", _("LDAP Connector: Modified user %s (Added: %s, Removed: %s, Changed: %s)" % @@ -580,9 +585,6 @@ def ldap_sync(add_to_changelog, only_username): save_users(users) - # Store time of the last sync - file(g_ldap_sync_time_file, 'w').write('%s\n' % time.time()) - # Calculates the attributes of the users which are locked for users managed # by this connector def ldap_locked_attributes():

11 years, 9 months

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2012