Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: FIX: Preventing autocomplete in password fields of "edit profile" dialog

by Lars Michelsen

Module: check_mk Branch: master Commit: 599543c336688d3f73dba20ba20a3fcefdb83946 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=599543c336688d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 5 15:37:28 2013 +0100 FIX: Preventing autocomplete in password fields of "edit profile" dialog --- .bugs/885 | 7 +++++-- ChangeLog | 1 + web/htdocs/wato.py | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.bugs/885 b/.bugs/885 index aa1ce44..4cd4848 100644 --- a/.bugs/885 +++ b/.bugs/885 @@ -1,10 +1,13 @@ Title: Password field in personal settings must not be prefilled by browser Component: multisite -State: open +Class: bug +State: done Date: 2013-01-21 15:55:44 Targetversion: 1.2.2 -Class: bug If the browser enters a possible previous password then after saving (because of changes to the notifications) the user password gets changed and the user logged out - forever. + +2013-02-05 15:36:48: changed state open -> done +Just implemented. Added "autocomplete=off" attribute to input fields. diff --git a/ChangeLog b/ChangeLog index 8ec9788..9aae64a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ * Added comment painter to notification related views * Added compatibility code to use hashlib.md5() instead of md5.md5(), which is deprecated in python > 2.5 to prevent warning messages in apache error log + * FIX: Preventing autocomplete in password fields of "edit profile" dialog BI: * Use Ajax to delay rendering of invisible parts of the tree (this diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f8dd222..18b9a43 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10956,10 +10956,10 @@ def page_user_profile(): if config.may('general.change_password') and not is_locked('password'): forms.section(_("Password")) - html.password_input('password') + html.password_input('password', autocomplete = "off") forms.section(_("Password confirmation")) - html.password_input('password2') + html.password_input('password2', autocomplete = "off") if config.may('general.edit_profile'): select_language(config.get_language(''))

11 years, 7 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 044ac0714ecc06edcc932534a00d1390de7ba826 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=044ac0714ecc06… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 5 17:12:19 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0915

by Lars Michelsen

Module: check_mk Branch: master Commit: 00e756a7d42757377d13e2e11689c6b1022dc847 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00e756a7d42757… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 5 16:18:21 2013 +0100 Updated bug entries #0915 --- .bugs/915 | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/.bugs/915 b/.bugs/915 new file mode 100644 index 0000000..4011a40 --- /dev/null +++ b/.bugs/915 @@ -0,0 +1,20 @@ +Title: More comfortable handling of "Performance Counters" monitoring +Component: checks +State: open +Date: 2013-02-05 16:14:01 +Targetversion: 1.2.3 +Class: feature + +At the moment the ids of performancecounters must be scanned and configured +manually (http://mathias-kettner.de/checkmk_windows.html#H1:Performance%20Counters,%2…) + +This is not very comfortable and also no auto detection. It would be nice to have +a functionality where we can deliver a default config or one user could create +his own config like: + +[winperf] + counters = $MSExchangeTransport Queues$:msx_queues + +Then, on agent startup the variable would be used to scan for the id automatically. +The localization problem has to be fixed when implementing this. Maybe there is +something like LANG=c ...?

11 years, 7 months

Check_MK Git: check_mk: FIX: Fixed synchronisation of mkeventd configs in distributed WATO setups

by Lars Michelsen

Module: check_mk Branch: master Commit: d39532389d176708d24a33a24918d92eb3422785 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d39532389d1767… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 5 16:46:50 2013 +0100 FIX: Fixed synchronisation of mkeventd configs in distributed WATO setups --- ChangeLog | 1 + web/htdocs/wato.py | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9aae64a..575afc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ * FIX: Fixed generation of auth.php (Needed for NagVis Multisite Authorisation) * FIX: Fixed missing general.* permissions in auth.php on slave sites in case of distributed WATO setups + * FIX: Fixed synchronisation of mkeventd configs in distributed WATO setups Event Console: * Added UNIX socket for sending events to the EC diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 18b9a43..52e5954 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -125,30 +125,6 @@ snapshot_dir = var_dir + "snapshots/" sync_snapshot_file = defaults.tmp_dir + "/sync_snapshot.tar.gz" repstatus_file = var_dir + "replication_status.mk" -# Directories and files to synchronize during replication -replication_paths = [ - ( "dir", "check_mk", root_dir ), - ( "dir", "multisite", multisite_dir ), - ( "file", "htpasswd", defaults.htpasswd_file ), - ( "file", "auth.secret", '%s/auth.secret' % os.path.dirname(defaults.htpasswd_file) ), - ( "file", "auth.serials", '%s/auth.serials' % os.path.dirname(defaults.htpasswd_file) ), - # Also replicate the user-settings of Multisite? While the replication - # as such works pretty well, the count of pending changes will not - # know. - ( "dir", "usersettings", defaults.var_dir + "/web" ), -] - - -# Directories and files for backup & restore -backup_paths = replication_paths + [ - ( "file", "sites", sites_mk) - # autochecks are a site-local ressource. This does only make - # sense for single-site installations. How should we handle - # this? - # ( "dir", "autochecks", defaults.autochecksdir ), - -] - ALL_HOSTS = [ '@all' ] ALL_SERVICES = [ "" ] @@ -11886,6 +11862,30 @@ def load_plugins(): g_rulespec_group = {} g_rulespec_groups = [] + # Directories and files to synchronize during replication + global replication_paths, backup_paths + replication_paths = [ + ( "dir", "check_mk", root_dir ), + ( "dir", "multisite", multisite_dir ), + ( "file", "htpasswd", defaults.htpasswd_file ), + ( "file", "auth.secret", '%s/auth.secret' % os.path.dirname(defaults.htpasswd_file) ), + ( "file", "auth.serials", '%s/auth.serials' % os.path.dirname(defaults.htpasswd_file) ), + # Also replicate the user-settings of Multisite? While the replication + # as such works pretty well, the count of pending changes will not + # know. + ( "dir", "usersettings", defaults.var_dir + "/web" ), + ] + + # Directories and files for backup & restore + backup_paths = replication_paths + [ + ( "file", "sites", sites_mk) + # autochecks are a site-local ressource. This does only make + # sense for single-site installations. How should we handle + # this? + # ( "dir", "autochecks", defaults.autochecksdir ), + ] + + # Declare WATO-specific permissions config.declare_permission_section("wato", _("WATO - Check_MK's Web Administration Tool"))

11 years, 7 months

Check_MK Git: check_mk: Added compatibility code to use hashlib.md5() instead of md5.md5(), which is deprecated in python > 2. 5 to prevent warning messages in apache error log

by Lars Michelsen

Module: check_mk Branch: master Commit: 2ab1edefe3767950e052f2bd76a6b0186a49711f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ab1edefe37679… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 5 15:16:45 2013 +0100 Added compatibility code to use hashlib.md5() instead of md5.md5(), which is deprecated in python > 2.5 to prevent warning messages in apache error log --- ChangeLog | 2 ++ web/htdocs/login.py | 11 ++++++++--- web/htdocs/md5crypt.py | 11 +++++++---- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index ded1aa4..8ec9788 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,8 @@ Multisite: * Added comment painter to notification related views + * Added compatibility code to use hashlib.md5() instead of md5.md5(), which + is deprecated in python > 2.5 to prevent warning messages in apache error log BI: * Use Ajax to delay rendering of invisible parts of the tree (this diff --git a/web/htdocs/login.py b/web/htdocs/login.py index d9f843d..8af8b71 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -27,7 +27,12 @@ import defaults, htmllib, config, userdb from lib import * from mod_python import apache -import os, md5, time +import os, time + +try: + from hashlib import md5 +except ImportError: + from md5 import md5 # deprecated with python 2.5 def site_cookie_name(site_id = None): if not site_id: @@ -54,7 +59,7 @@ def load_secret(): # Create new secret when this installation has no secret if secret == '': - secret = md5.md5(str(time.time())).hexdigest() + secret = md5(str(time.time())).hexdigest() file(secret_path, 'w').write(secret + "\n") return secret @@ -69,7 +74,7 @@ def load_serial(user_id): # Generates the hash to be added into the cookie value def generate_hash(username, now, serial): secret = load_secret() - return md5.md5(username + now + str(serial) + secret).hexdigest() + return md5(username + now + str(serial) + secret).hexdigest() def del_auth_cookie(): name = site_cookie_name() diff --git a/web/htdocs/md5crypt.py b/web/htdocs/md5crypt.py index f83faf5..cd7a4a6 100644 --- a/web/htdocs/md5crypt.py +++ b/web/htdocs/md5crypt.py @@ -35,15 +35,18 @@ # This port adds no further stipulations. I forfeit any copyright interest. -import md5 +try: + from hashlib import md5 +except ImportError: + from md5 import md5 # deprecated with python 2.5 def md5crypt(password, salt, magic='$1$'): # /* The password first, since that is what is most unknown */ /* Then our magic string */ /* Then the raw salt */ - m = md5.new() + m = md5() m.update(password + magic + salt) # /* Then just as many characters of the MD5(pw,salt,pw) */ - mixin = md5.md5(password + salt + password).digest() + mixin = md5(password + salt + password).digest() for i in range(0, len(password)): m.update(mixin[i % 16]) @@ -61,7 +64,7 @@ def md5crypt(password, salt, magic='$1$'): # /* and now, just to make sure things don't run too fast */ for i in range(1000): - m2 = md5.md5() + m2 = md5() if i & 1: m2.update(password) else:

11 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0914

by Lars Michelsen

Module: check_mk Branch: master Commit: 460158d5e3b96de24429747881e6e7058f57a44c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=460158d5e3b96d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 5 08:58:20 2013 +0100 Updated bug entries #0914 --- .bugs/914 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/914 b/.bugs/914 new file mode 100644 index 0000000..831b38c --- /dev/null +++ b/.bugs/914 @@ -0,0 +1,9 @@ +Title: Host views miss filter "Last host state change" +Component: multisite +State: open +Date: 2013-02-05 08:57:08 +Targetversion: 1.2.3 +Class: feature + +The service views have such a filter for the service state. +It would be nice to have it also in host views.

11 years, 7 months

Check_MK Git: check_mk: cmk --notify: improved logging on wrong notification type

by Andreas Boesl

Module: check_mk Branch: master Commit: 25a9b56d70dc9626a72564d0e9e88412ad594cc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25a9b56d70dc96… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 5 14:20:15 2013 +0100 cmk --notify: improved logging on wrong notification type --- ChangeLog | 1 + modules/notify.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ded1aa4..977dc9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * FIX: Inventory for cluster nodes who are part of multiple clusters * cmk --notify: added plugin for sms notification * FIX: precompiled checks: correct handling of sys.exit() call when using python2.4 + * cmk --notify: improved logging on wrong notification type Checks & Agents: * winperf_processor now outputs float usage instead of integer diff --git a/modules/notify.py b/modules/notify.py index 6742b1b..eb4bf17 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -360,8 +360,9 @@ def notify_flexible(contact, context, notification_table): # Check notification type event, allowed_events = check_notification_type(context, entry["host_events"], entry["service_events"]) if event not in allowed_events: - notify_log(" - Skipping: wrong notification type %s, only %s are allowed" % - (event, ",".join(allowed_events)) ) + notification_type = context.get("NOTIFICATIONTYPE","") + notify_log(" - Skipping: wrong notification type %s (%s), only %s are allowed" % + (event, notification_type, ",".join(allowed_events)) ) continue # Check notification number (in case of repeated notifications/escalations)

11 years, 7 months

Check_MK Git: check_mk: mail notification plugin: fixed bug in non OMD environment

by Andreas Boesl

Module: check_mk Branch: master Commit: 1769ab6543a38c9a92ce6c38c66abcfedbf7b117 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1769ab6543a38c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 5 14:10:39 2013 +0100 mail notification plugin: fixed bug in non OMD environment --- notifications/mail | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/notifications/mail b/notifications/mail index ec6c753..501d490 100755 --- a/notifications/mail +++ b/notifications/mail @@ -314,8 +314,12 @@ def send_mail(m, target): return True def fetch_pnp_data(context, params): - return os.popen('REMOTE_USER="%s" php %s/share/pnp4nagios/htdocs/index.php "%s"' % - (context['CONTACTNAME'], context['OMD_ROOT'], params)).read() + try: + prefix_url = "%s/share" % context['OMD_ROOT'] + except: + # Non-omd environment + prefix_url = "" + return os.popen('REMOTE_USER="%s" php %s/pnp4nagios/htdocs/index.php "%s"' % (context['CONTACTNAME'], prefix_url, params)).read() def fetch_num_sources(context): svc_desc = context['WHAT'] == 'HOST' and '_HOST_' or context['SERVICEDESC']

11 years, 7 months

Check_MK Git: check_mk: Bugfix: commented paint_host_list in lib.py, reactivate later on

by Andreas Boesl

Module: check_mk Branch: master Commit: f91f72b09e1adc258a74e753cd9d5399ee43fc1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f91f72b09e1adc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 5 13:35:23 2013 +0100 Bugfix: commented paint_host_list in lib.py, reactivate later on --- web/htdocs/lib.py | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 61af5c6..c66a770 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -220,12 +220,13 @@ def format_plugin_output(output, row = None): output = output.replace("(!)", warn_marker) \ .replace("(!!)", crit_marker) \ .replace("(?)", unknown_marker) - if row and "[running on" in output: - a = output.index("[running on") - e = output.index("]", a) - hosts = output[a+12:e].replace(" ","").split(",") - css, h = paint_host_list(row["site"], hosts) - output = output[:a] + "running on " + h + output[e+1:] + # TODO: reimplement, but considering correct paint_host_list call + #if row and "[running on" in output: + # a = output.index("[running on") + # e = output.index("]", a) + # hosts = output[a+12:e].replace(" ","").split(",") + # css, h = paint_host_list(row["site"], hosts) + # output = output[:a] + "running on " + h + output[e+1:] return output

11 years, 7 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: df82183e96f1d9eec09d294131279d5c3677d4de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df82183e96f1d9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 4 19:01:42 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2013