Module: check_mk
Branch: master
Commit: 8484cc34550c5187a94b16ac5d428463b72d3388
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8484cc34550c51…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Dec 16 12:15:49 2013 +0100
FIX LDAP diagnostic LOG can now have the $OMD_SITE$ macro configured via WATO
The macro was configurable via plain config files for a long time, but it
could not be configured via WATO. This is now possible.
---
.werks/331 | 11 +++++++++++
ChangeLog | 1 +
web/htdocs/valuespec.py | 10 ++++++++++
web/plugins/wato/check_mk_configuration.py | 1 +
4 files changed, 23 insertions(+)
diff --git a/.werks/331 b/.werks/331
new file mode 100644
index 0000000..a6a1278
--- /dev/null
+++ b/.werks/331
@@ -0,0 +1,11 @@
+Title: LDAP diagnostic LOG can now have the $OMD_SITE$ macro configured via WATO
+Level: 1
+Component: wato
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1387192477
+Targetversion: future
+
+The macro was configurable via plain config files for a long time, but it
+could not be configured via WATO. This is now possible.
diff --git a/ChangeLog b/ChangeLog
index 16082fb..7a17c48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,6 +44,7 @@
* 0309 FIX: Trying to prevent read/write conflicts with a large user base...
* 0311 FIX: Fixed "Inventory failed" message when trying an inventory on clusters via WATO...
* 0330 FIX: Improved performance of WATO slave push with a large user base...
+ * 0331 FIX: LDAP diagnostic LOG can now have the $OMD_SITE$ macro configured via WATO...
Notifications:
* 0108 FIX: Prevent service notification on host alerts...
diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py
index 08c7348..fa02b21 100644
--- a/web/htdocs/valuespec.py
+++ b/web/htdocs/valuespec.py
@@ -598,11 +598,21 @@ class Filename(TextAscii):
self._default_path = kwargs["default"]
else:
self._default_path = "/tmp/foo"
+ if "trans_func" in kwargs:
+ self._trans_func = kwargs["trans_func"]
+ else:
+ self._trans_func = None
def canonical_value(self):
return self._default_path
def validate_value(self, value, varprefix):
+ # The transformation function only changes the value for validation. This is
+ # usually a function which is later also used within the code which uses
+ # this variable to e.g. replace macros
+ if self._trans_func:
+ value = self._trans_func(value)
+
if len(value) == 0:
raise MKUserError(varprefix, _("Please enter a filename."))
diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py
index 60d64f0..2a25018 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -791,6 +791,7 @@ register_configvar(group,
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"),
Module: check_mk
Branch: master
Commit: 52c448c91a6d5d743026f7ed38e425ef6d33334b
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52c448c91a6d5d…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Dec 16 12:09:06 2013 +0100
FIX Improved performance of WATO slave push with a large user base
When having a large number of users (several thousands) and pushing them to a
slave site, the user database hook was executed twice, which resulted in a
senseless duplicate calculation of things. This has been resolved now.
Conflicts:
.bugs/1018
ChangeLog
---
.bugs/980 | 7 +++++--
.werks/330 | 12 ++++++++++++
ChangeLog | 1 +
web/htdocs/userdb.py | 1 +
web/plugins/wato/userdb.py | 5 -----
5 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/.bugs/980 b/.bugs/980
index 303d566..d285c64 100644
--- a/.bugs/980
+++ b/.bugs/980
@@ -1,9 +1,9 @@
Title: Hooks users-saved called duplicate when doing WATO sync
Component: wato
-State: open
+Class: nastiness
+State: done
Date: 2013-10-08 18:24:47
Targetversion: 1.2.3i3
-Class: nastiness
When doing a replicated WATO sync, then the hook users-saved is
being called twice. We should elimiate that. Especially because
@@ -28,3 +28,6 @@ there might be involved lengthy LDAP syncs
[Tue Oct 08 09:23:31 2013] [warn] [client 127.0.0.1] CALLING HOOK activate-changes
[Tue Oct 08 09:23:32 2013] [warn] [client 127.0.0.1] FINISHED HOOK activate-changes
[Tue Oct 08 09:23:32 2013] [warn] [client 127.0.0.1] RESTARTED
+
+2013-12-16 12:06:40: changed state open -> done
+Removed the snapshot-pushed hook.
diff --git a/.werks/330 b/.werks/330
new file mode 100644
index 0000000..47eb7ae
--- /dev/null
+++ b/.werks/330
@@ -0,0 +1,12 @@
+Title: Improved performance of WATO slave push with a large user base
+Level: 1
+Component: wato
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1387192025
+Targetversion: future
+
+When having a large number of users (several thousands) and pushing them to a
+slave site, the user database hook was executed twice, which resulted in a
+senseless duplicate calculation of things. This has been resolved now.
diff --git a/ChangeLog b/ChangeLog
index b5d9350..5bacde5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,6 +42,7 @@
* 0242 FIX: Parameters for clustered services can now be configured on the cluster host...
* 0309 FIX: Trying to prevent read/write conflicts with a large user base...
* 0311 FIX: Fixed "Inventory failed" message when trying an inventory on clusters via WATO...
+ * 0330 FIX: Improved performance of WATO slave push with a large user base...
Notifications:
* 0108 FIX: Prevent service notification on host alerts...
diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py
index 55905d1..6e23468 100644
--- a/web/htdocs/userdb.py
+++ b/web/htdocs/userdb.py
@@ -664,6 +664,7 @@ def hook_login(username, password):
# Is called on:
# a) before rendering the user management page in WATO
# b) a user is created during login (only for this user)
+# c) Before activating the changes in WATO
def hook_sync(connector_id = None, add_to_changelog = False, only_username = None, raise_exc = False):
if connector_id:
connectors = [ get_connector(connector_id) ]
diff --git a/web/plugins/wato/userdb.py b/web/plugins/wato/userdb.py
index 0d5663e..43608fd 100644
--- a/web/plugins/wato/userdb.py
+++ b/web/plugins/wato/userdb.py
@@ -30,8 +30,3 @@ def sync_pre_activate_changes(_unused):
if 'wato_pre_activate_changes' in config.userdb_automatic_sync:
userdb.hook_sync()
api.register_hook('pre-activate-changes', sync_pre_activate_changes)
-
-def sync_snapshot_pushed():
- if 'wato_snapshot_pushed' in config.userdb_automatic_sync:
- userdb.hook_sync()
-api.register_hook('snapshot-pushed', sync_snapshot_pushed)
Module: check_mk
Branch: master
Commit: 4155ba1ccbb1e0a9761b2e45076c2c6b565f16e3
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4155ba1ccbb1e0…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Dec 16 11:45:27 2013 +0100
Removed Distributed WATO peer mode
This mode did not really work and was not used by any known installation. This
confused users and hand no relevance. Dropped that feature.
---
.bugs/1018 | 7 ++-
.werks/329 | 9 ++++
ChangeLog | 3 +-
web/htdocs/wato.py | 138 ++++------------------------------------------------
4 files changed, 26 insertions(+), 131 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4155ba1ccb…
Module: check_mk
Branch: master
Commit: 77bd890e111b21b7545bacb3f6788d1cae400343
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77bd890e111b21…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Dec 16 12:03:46 2013 +0100
FIX agent_vpshere: new option for supporting ESX 4.1
The current fast implementation of the ESX vSphere agent for Check_MK does not
yet support ESX versions older than 5.0. The most promiment such version is
ESX 4.1. There is now a new option <i>Support ESX 4.1 (using slower PySphere
implementation)</i> in the WATO rule for the ESX agent that forces using the
old pysphere-based agent.
---
.bugs/943 | 8 +-
.werks/59 | 14 +++
ChangeLog | 2 +-
agents/special/agent_vsphere | 14 ++-
agents/special/agent_vsphere.pysphere | 5 +-
checks/agent_vsphere | 4 +-
web/plugins/wato/datasource_programs.py | 159 +++++++++++++++++--------------
7 files changed, 126 insertions(+), 80 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=77bd890e11…
Module: check_mk
Branch: master
Commit: 924abac082fa8bbd698d3742cae0e642dc481cd5
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=924abac082fa8b…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Dec 16 11:34:36 2013 +0100
FIX Modified languages (via local hierarchy) were listed twice
Localization files which were overridden via files in the local-hierarchy of OMD
were listed twice in the user profile dialog. This has been fixed now.
---
.werks/328 | 9 +++++++++
ChangeLog | 1 +
web/htdocs/lib.py | 8 ++++----
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/.werks/328 b/.werks/328
new file mode 100644
index 0000000..fa221d4
--- /dev/null
+++ b/.werks/328
@@ -0,0 +1,9 @@
+Title: Modified languages (via local hierarchy) were listed twice
+Level: 1
+Component: wato
+Version: 1.2.4b1
+Date: 1387189997
+Class: fix
+
+Localization files which were overridden via files in the local-hierarchy of OMD
+were listed twice in the user profile dialog. This has been fixed now.
diff --git a/ChangeLog b/ChangeLog
index e85c337..0ba1bd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,7 @@
* 0242 FIX: Parameters for clustered services can now be configured on the cluster host...
* 0309 FIX: Trying to prevent read/write conflicts with a large user base...
* 0311 FIX: Fixed "Inventory failed" message when trying an inventory on clusters via WATO...
+ * 0328 FIX: Modified languages (via local hierarchy) were listed twice...
Notifications:
* 0108 FIX: Prevent service notification on host alerts...
diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py
index 3994f6d..ca826af 100644
--- a/web/htdocs/lib.py
+++ b/web/htdocs/lib.py
@@ -180,18 +180,18 @@ def get_languages():
# Add the hard coded english language to the language list
# It must be choosable even if the administrator changed the default
# language to a custom value
- languages = [ (None, _('English')) ]
+ languages = set([ (None, _('English')) ])
for lang_dir in get_language_dirs():
try:
- languages += [ (val, get_language_alias(val))
- for val in os.listdir(lang_dir) if not '.' in val ]
+ languages.update([ (val, get_language_alias(val))
+ for val in os.listdir(lang_dir) if not '.' in val ])
except OSError:
# Catch "OSError: [Errno 2] No such file or
# directory:" when directory not exists
pass
- return languages
+ return list(languages)
def load_language(lang):
# Make current language globally known to all of our modules
Module: check_mk
Branch: master
Commit: d822b94e2acf89c21794d29d9950f21e43cbab0b
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d822b94e2acf89…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Dec 16 11:29:34 2013 +0100
Updated bug entries #1085
---
.bugs/1085 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.bugs/1085 b/.bugs/1085
index 0890761..d144dd3 100644
--- a/.bugs/1085
+++ b/.bugs/1085
@@ -1,9 +1,12 @@
Title: Personal settings: name of language de missing
Component: multisite
-State: open
+Class: nastiness
+State: done
Date: 2013-11-25 10:36:27
Targetversion: future
-Class: nastiness
In the personal setting when you want to select a language,
instead of "German" there is just a "de".
+
+2013-12-16 11:26:00: changed state open -> done
+Just added the missing alias file