Module: check_mk
Branch: master
Commit: 6be42230daaa560e21545515a5d4d5df4daf7002
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6be42230daaa56…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Sep 23 11:05:06 2014 +0200
userdb: avoid warning in Apache log about globals
---
web/htdocs/userdb.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py
index 80c8d3f..9ab3306 100644
--- a/web/htdocs/userdb.py
+++ b/web/htdocs/userdb.py
@@ -38,6 +38,9 @@ builtin_user_attribute_names = []
# Load all userdb plugins
def load_plugins():
+ global user_attributes
+ global multisite_user_connectors
+
# Do not cache the custom user attributes. They can be created by the user
# during runtime, means they need to be loaded during each page request.
# But delete the old definitions before to also apply removals of attributes
@@ -52,8 +55,8 @@ def load_plugins():
return
# declare & initialize global vars
- global user_attributes ; user_attributes = {}
- global multisite_user_connectors ; multisite_user_connectors = []
+ user_attributes = {}
+ multisite_user_connectors = []
load_web_plugins("userdb", globals())
Module: check_mk
Branch: master
Commit: 55aa7652fa1bcb056cd72f9175b2b69a1a262a66
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55aa7652fa1bcb…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Mon Sep 22 16:44:40 2014 +0200
fixed typo
---
.werks/1117 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.werks/1117 b/.werks/1117
index 5e1a9b4..df62097 100644
--- a/.werks/1117
+++ b/.werks/1117
@@ -7,6 +7,6 @@ Date: 1411396124
Class: feature
The agent_vsphere is now able to get the license usage from the LicenseManager instance.
-Upon inventory each license will lead to an own check name esx_licenses.
+Upon inventory each license will lead to an own check named esx_licenses.
The check parameters (absolute used, percentage used, all used) can be configured via the WATO rule
<tt>Number of used VMware licenses</tt>