Module: check_mk
Branch: master
Commit: 2264ab97414d63806a3cc34328ab92b605f97861
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2264ab97414d63…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Mar 18 13:20:38 2015 +0100
updated werk text
---
ChangeLog | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index fa90d59..79a99f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -314,6 +314,7 @@
* 2090 FIX: Fixed errors when editing / rendering custom url dashlets in some cases...
* 2092 FIX: Dashboards: Possible to configure an empty custom title
* 2145 FIX: LDAP-Sync: Handling user ids with special characters more user friendly...
+ * 2149 FIX: LDAP: The diagnostic log has been changed to use a fixed path...
WATO:
* 1760 Added search form to manual checks page
@@ -360,7 +361,6 @@
* 2045 FIX: Avoid fetching SNMP data when showing service list in WATO - unless Full Scan is pressed
* 2047 FIX: Allow overriding existing WATO rules by own files in local/ hierarchy...
* 2146 FIX: In distributed environments user notification rules trigger a profile synchronisation now...
- * 2149 FIX: LDAP: The diagnostic log has been changed to use a fixed path...
Notifications:
* 1662 notification plugin spectrum: finalized script. now able to handle host notications
Module: check_mk
Branch: master
Commit: 2b86ba46b3f8c4cc9d2fc2745d3a39af94c0e697
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b86ba46b3f8c4…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Mar 18 10:37:22 2015 +0100
Updated bug entries #2296
---
.bugs/2296 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.bugs/2296 b/.bugs/2296
index 326bd75..5658a10 100644
--- a/.bugs/2296
+++ b/.bugs/2296
@@ -1,12 +1,15 @@
Title: ldap debug logfile gives problems with distributed monitoring
Component: multisite
-State: open
+Class: bug
+State: done
Date: 2015-03-18 10:03:24
Targetversion: 1.2.6
-Class: bug
when configuring debug mode for the ldap connector a name for a logfile is suggested, which is in the
monitoring site. When using distributed monitoring, this setting is moved to the remite site. Since
the logfile name does not exist on the remote site and cannot be created, the restart of the remote site
fails.
The same problem happens when using 'omd mv'
+
+2015-03-18 10:37:20: changed state open -> done
+Fixed
Module: check_mk
Branch: master
Commit: 53822cbd262fcefe48d434fc7d18e6030bcaa6e3
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53822cbd262fce…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Mar 18 10:32:11 2015 +0100
#2149 FIX LDAP: The diagnostic log has been changed to use a fixed path
The LDAP diagnostic log, which should only be enabled for debugging purposes,
has been changed from a free configurable path to a fixed path. In your
OMD sites it will now always be located within <tt>var/log/ldap.log</tt>.
---
.werks/2149 | 12 ++++++++++++
ChangeLog | 1 +
web/plugins/config/builtin.py | 2 +-
web/plugins/userdb/ldap.py | 6 +++---
web/plugins/wato/check_mk_configuration.py | 18 ++++++++----------
5 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/.werks/2149 b/.werks/2149
new file mode 100644
index 0000000..7890d07
--- /dev/null
+++ b/.werks/2149
@@ -0,0 +1,12 @@
+Title: LDAP: The diagnostic log has been changed to use a fixed path
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1426671051
+
+The LDAP diagnostic log, which should only be enabled for debugging purposes,
+has been changed from a free configurable path to a fixed path. In your
+OMD sites it will now always be located within <tt>var/log/ldap.log</tt>.
diff --git a/ChangeLog b/ChangeLog
index 2f4ddf7..fa90d59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -360,6 +360,7 @@
* 2045 FIX: Avoid fetching SNMP data when showing service list in WATO - unless Full Scan is pressed
* 2047 FIX: Allow overriding existing WATO rules by own files in local/ hierarchy...
* 2146 FIX: In distributed environments user notification rules trigger a profile synchronisation now...
+ * 2149 FIX: LDAP: The diagnostic log has been changed to use a fixed path...
Notifications:
* 1662 notification plugin spectrum: finalized script. now able to handle host notications
diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py
index 01cb9f2..ff72a15 100644
--- a/web/plugins/config/builtin.py
+++ b/web/plugins/config/builtin.py
@@ -236,7 +236,7 @@ ldap_groupspec = {
}
ldap_active_plugins = {'email': {}, 'alias': {}, 'auth_expire': {}}
ldap_cache_livetime = 300
-ldap_debug_log = None
+ldap_debug_log = False
default_user_profile = {
'roles': ['user'],
}
diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py
index fd506d7..14c6558 100644
--- a/web/plugins/userdb/ldap.py
+++ b/web/plugins/userdb/ldap.py
@@ -125,11 +125,11 @@ ldap_umlaut_translation = {
# '----------------------------------------------------------------------'
def ldap_log(s):
- if config.ldap_debug_log is not None:
+ if config.ldap_debug_log:
if type(s) == unicode:
s = s.encode('utf-8')
- file(ldap_replace_macros(config.ldap_debug_log), "a").write('%s %s\n' %
- (time.strftime('%Y-%m-%d %H:%M:%S'), s))
+ log_file = defaults.log_dir + '/ldap.log'
+ file(log_file, "a").write('%s %s\n' % (time.strftime('%Y-%m-%d %H:%M:%S'), s))
class MKLDAPException(MKGeneralException):
pass
diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py
index 60c4a61..2573f38 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -939,16 +939,14 @@ register_configvar(group,
register_configvar(group,
"ldap_debug_log",
- Optional(
- Filename(
- label = _("Absolute path to log file"),
- default = defaults.var_dir + '/web/ldap-debug.log',
- trans_func = userdb.ldap_replace_macros,
- ),
- title = _("LDAP connection diagnostics"),
- label = _("Activate logging of LDAP transactions into a logfile"),
- help = _("If this option is used and set to a filename, Check_MK will create a logfile "
- "containing details about connecting to LDAP and the single transactions.")),
+ Checkbox(
+ title = _("LDAP connection diagnostics"),
+ label = _("Activate logging of LDAP transactions"),
+ help = _("If this option is enabled, Check_MK will create a log file in "
+ "<tt>var/log/ldap.log</tt> within your site in OMD environments. "
+ "You should enable this option only for debugging."),
+ default_value = False
+ ),
domain = "multisite",
in_global_settings = False,
)
Module: check_mk
Branch: master
Commit: 1f99e091c2dcc9c329bb5887eb4eec8b65f23935
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f99e091c2dcc9…
Author: Goetz Golla <gg(a)mathias-kettner.de>
Date: Wed Mar 18 10:07:49 2015 +0100
Updated bug entries #2296
---
.bugs/2296 | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/.bugs/2296 b/.bugs/2296
new file mode 100644
index 0000000..326bd75
--- /dev/null
+++ b/.bugs/2296
@@ -0,0 +1,12 @@
+Title: ldap debug logfile gives problems with distributed monitoring
+Component: multisite
+State: open
+Date: 2015-03-18 10:03:24
+Targetversion: 1.2.6
+Class: bug
+
+when configuring debug mode for the ldap connector a name for a logfile is suggested, which is in the
+monitoring site. When using distributed monitoring, this setting is moved to the remite site. Since
+the logfile name does not exist on the remote site and cannot be created, the restart of the remote site
+fails.
+The same problem happens when using 'omd mv'
Module: check_mk
Branch: master
Commit: 3e87030a1d53a3888465db459ee98e875532d1cf
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e87030a1d53a3…
Author: Konstantin Büttner <kb(a)mathias-kettner.de>
Date: Wed Mar 18 09:49:40 2015 +0100
Some spelling corrections
---
agents/plugins/mk_logwatch | 2 +-
checkman/hpux_fchba | 2 +-
checks/winperf_if | 2 +-
mkeventd/web/plugins/wato/mkeventd.py | 2 +-
modules/check_mk_base.py | 2 +-
web/htdocs/index.py | 2 +-
web/htdocs/wato.py | 4 ++--
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch
index bf6f745..921da63 100755
--- a/agents/plugins/mk_logwatch
+++ b/agents/plugins/mk_logwatch
@@ -326,7 +326,7 @@ except Exception, e:
sys.exit(1)
# Simply ignore errors in the status file. In case of a corrupted status file we simply begin
-# with an empty status. That keeps the monitoring up and running - even if we might loose a
+# with an empty status. That keeps the monitoring up and running - even if we might lose a
# message in the extreme case of a corrupted status file.
try:
status = read_status()
diff --git a/checkman/hpux_fchba b/checkman/hpux_fchba
index dd20897..f3c87b7 100644
--- a/checkman/hpux_fchba
+++ b/checkman/hpux_fchba
@@ -6,7 +6,7 @@ distribution: check_mk
description:
This check is intended to alert you of problems in a servers SAN
connection. It can differentiate different FC Login states and
- different driver states. If a port looses connectivity, you will
+ different driver states. If a port loses connectivity, you will
be getting a {"CRIT"} status.
The check will go to {"UNKNOWN"} if the HBA is removed, or to
diff --git a/checks/winperf_if b/checks/winperf_if
index 2c9627e..c88b25d 100644
--- a/checks/winperf_if
+++ b/checks/winperf_if
@@ -109,7 +109,7 @@ def convert_winperf_if(info):
as_dict = dict(zip(headers, map(lambda x: x.rstrip(), line)))
- # Unfortunately teamed interfaces loose their #x index and are no longer
+ # Unfortunately teamed interfaces lose their #x index and are no longer
# distinguishable with the data from the Win32_NetworkAdapter.
# Fortunately this index information is still available in the teaming section
# The GUID is used to combine the two datasets
diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py
index 3950645..b3a2b86 100644
--- a/mkeventd/web/plugins/wato/mkeventd.py
+++ b/mkeventd/web/plugins/wato/mkeventd.py
@@ -1815,7 +1815,7 @@ if mkeventd_enabled:
"retention_interval",
Age(title = _("State Retention Interval"),
help = _("In this interval the event daemon will save its state "
- "to disk, so that you won't loose your current event "
+ "to disk, so that you won't lose your current event "
"state in case of a crash."),
default_value = 60,
),
diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py
index 9251418..6db4bb2 100644
--- a/modules/check_mk_base.py
+++ b/modules/check_mk_base.py
@@ -1057,7 +1057,7 @@ def get_average(itemname, this_time, this_val, backlog_minutes, initialize_zero
last_time, last_val = g_counters.get(itemname)
timedif = this_time - last_time
- # Gracefully handle time-anomaly of target systems. We loose
+ # Gracefully handle time-anomaly of target systems. We lose
# one value, but what then heck..
if timedif < 0:
timedif = 0
diff --git a/web/htdocs/index.py b/web/htdocs/index.py
index ac4de43..3e014ea 100644
--- a/web/htdocs/index.py
+++ b/web/htdocs/index.py
@@ -115,7 +115,7 @@ def handler(req, fields = None, profiling = True):
# profiling can be enabled in multisite.mk
if profiling and config.profile:
import cProfile # , pstats, sys, StringIO, tempfile
- # the profiler looses the memory about all modules. We need to hand over
+ # the profiler loses the memory about all modules. We need to hand over
# the request object in the apache module.
# Ubuntu: install python-profiler when using this feature
profilefile = defaults.var_dir + "/web/multisite.profile"
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index dc927bc..b3561a1 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -11402,7 +11402,7 @@ def automation_push_snapshot():
_("Site ID mismatch. Our ID is '%s', but you are saying we are '%s'.") %
(our_id, site_id))
- # Make sure there are no local changes we would loose! But only if we are
+ # Make sure there are no local changes we would lose! But only if we are
# distributed ourselves (meaning we are a peer).
if is_distributed():
pending = parse_audit_log("pending")
@@ -13787,7 +13787,7 @@ def mode_ruleeditor(phase):
search_form(_("Search for rules: "), "rulesets")
# Group names are separated with "/" into main group and optional subgroup.
- # Do not loose carefully manually crafted order of groups!
+ # Do not lose carefully manually crafted order of groups!
groupnames = []
for gn, rulesets in g_rulespec_groups:
main_group = gn.split('/')[0]