Module: check_mk
Branch: master
Commit: 64d90c8fce3c97b4848b855be0db12defba3d6e9
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64d90c8fce3c97…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Dec 19 15:22:29 2013 +0100
FIX Fix broken Site status switching via sidebar snapin
The bug was introduced in 1.2.4b1 due to the new handling
(and avoiding) of unneccessary livestatus connects.
---
.werks/436 | 11 +++++++++++
ChangeLog | 1 +
web/htdocs/main.py | 8 ++++----
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/.werks/436 b/.werks/436
new file mode 100644
index 0000000..e70d293
--- /dev/null
+++ b/.werks/436
@@ -0,0 +1,11 @@
+Title: Fix broken Site status switching via sidebar snapin
+Level: 2
+Component: multisite
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1387462864
+Targetversion: future
+
+The bug was introduced in 1.2.4b1 due to the new handling
+(and avoiding) of unneccessary livestatus connects.
diff --git a/ChangeLog b/ChangeLog
index 3d213c0..d6f450b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -92,6 +92,7 @@
* 0246 FIX: brocade_fcport: fixed error in pnp-template...
* 0393 FIX: LDAP: Enabled paged LDAP search by default now with a page size of 1000...
* 0394 FIX: LDAP: Auth expiration plugin now checks users for being disabled (in AD)...
+ * 0436 FIX: Fix broken Site status switching via sidebar snapin...
WATO:
* 0308 Multisite can now set rotation view permissions for NagVis...
diff --git a/web/htdocs/main.py b/web/htdocs/main.py
index a01a82f..c0e4815 100644
--- a/web/htdocs/main.py
+++ b/web/htdocs/main.py
@@ -50,8 +50,8 @@ def page_index():
</html>
""" % (heading, start_url))
-# This function does nothing. The sites have already
-# been reconfigured according to the variable _site_switch,
-# because that variable is processed by connect_to_livestatus()
+# This function does almost nothing. It just makes sure that
+# a livestatus-connection is built up, since connect_to_livestatus()
+# handles the _site_switch variable.
def ajax_switch_site():
- pass
+ html.live
Module: check_mk
Branch: master
Commit: d974bbc70c20c410c5ff548e84c0741f9dc968da
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d974bbc70c20c4…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Dec 19 14:56:38 2013 +0100
FIX esx_vsphere_sensors: Fix garbled output in case of placeholder VMs
When using placeholder VMs in the section of <tt>esx_vsphere_sensors</tt> appeared
some debug output. That lead to assuming an <tt>UNKNOWN</tt> state for the sensors
check. This has been fixed.
---
.werks/435 | 12 ++++++++++++
ChangeLog | 1 +
agents/special/agent_vsphere | 1 -
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/.werks/435 b/.werks/435
new file mode 100644
index 0000000..4dd98ac
--- /dev/null
+++ b/.werks/435
@@ -0,0 +1,12 @@
+Title: esx_vsphere_sensors: Fix garbled output in case of placeholder VMs
+Level: 1
+Component: checks
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1387461316
+Targetversion: future
+
+When using placeholder VMs in the section of <tt>esx_vsphere_sensors</tt> appeared
+some debug output. That lead to assuming an <tt>UNKNOWN</tt> state for the sensors
+check. This has been fixed.
diff --git a/ChangeLog b/ChangeLog
index b4eb283..3d213c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -70,6 +70,7 @@
* 0351 FIX: local: Catch invalid state codes and map to 3 (UNKNOWN)...
* 0397 FIX: mrpe: tolerate performance variable names with spaces...
* 0399 FIX: check_ftp: cleanup configuration via WATO, remove Hostname field...
+ * 0435 FIX: esx_vsphere_sensors: Fix garbled output in case of placeholder VMs...
Multisite:
* 0371 Added log class filter to hostsvcevents view
diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere
index 525c1dd..f65eae0 100755
--- a/agents/special/agent_vsphere
+++ b/agents/special/agent_vsphere
@@ -544,7 +544,6 @@ if not error:
def is_placeholder_vm(devices):
elements = get_pattern("<VirtualDevice xsi:type=\"([^\"]+)", devices)
- pprint.pprint(elements)
if "VirtualDisk" not in elements:
return True
return False
Module: check_mk
Branch: master
Commit: 15768433ac16a08bc0675d9367445351a36e3780
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15768433ac16a0…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Thu Dec 19 14:49:51 2013 +0100
New mkp package for web applications: iNag / nagstatus / nagios status.dat
This mkp package is not in the official check_mk build.
You can find it in the check_mk git under doc/treasures/webapps.
For further information please refer to the README in the webapps dir.
---
.werks/247 | 10 ++++++++++
ChangeLog | 1 +
doc/treasures/webapps/README | 17 +++++++++++++++++
doc/treasures/webapps/cmk_nagios_webapps-1.1.mkp | Bin 0 -> 3942 bytes
4 files changed, 28 insertions(+)
diff --git a/.werks/247 b/.werks/247
new file mode 100644
index 0000000..b1e10d2
--- /dev/null
+++ b/.werks/247
@@ -0,0 +1,10 @@
+Title: New mkp package for web applications: iNag / nagstatus / nagios status.dat
+Level: 1
+Component: multisite
+Version: 1.2.5i1
+Date: 1387460746
+Class: feature
+
+This mkp package is not in the official check_mk build.
+You can find it in the check_mk git under doc/treasures/webapps.
+For further information please refer to the README in the webapps dir.
diff --git a/ChangeLog b/ChangeLog
index 502d5ab..4961941 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -76,6 +76,7 @@
* 0352 Avoid Livestatus connections on pages that do not need them...
* 0390 Added an icon selector to the view editor...
* 0391 Added sorter / filter for host/service service levels...
+ * 0247 New mkp package for web applications: iNag / nagstatus / nagios status.dat...
* 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in Chrome/IE
* 0239 FIX: Fixed incorrect html formatting when displaying host or service comments...
* 0307 FIX: Increased performance of multisite GUI with a large userbase...
diff --git a/doc/treasures/webapps/README b/doc/treasures/webapps/README
new file mode 100644
index 0000000..0452612
--- /dev/null
+++ b/doc/treasures/webapps/README
@@ -0,0 +1,17 @@
+Installing this mkp package results in the following new features
+
+* INAG support (iPhone nagios app)
+Only works with basic auth activated
+
+* Nagstatus support (Windows sidebar / desktop gadget)
+http://monitoringhost/site/check_mk/nagios_webapps.py?cmd=nagstatus.xml&_username=XXXXXX&_secret=MAWSYCJAMAICCFBADFDS
+
+* Get Logfile of last 24 hours
+http://monitoringhost/site/check_mk/nagios_webapps.py?cmd=nagios.log&_username=XXXXXX&_secret=MAWSYCJAMAICCFBADFDS
+
+* Get nagios status.dat
+http://monitoringhost/site/check_mk/nagios_webapps.py?cmd=status.dat&_username=XXXXXX&_secret=MAWSYCJAMAICCFBADFDS
+
+Note:
+All of this features also work in distributed setups
+So you can aquire on big status.dat file which reflects the state of several sites.
diff --git a/doc/treasures/webapps/cmk_nagios_webapps-1.1.mkp b/doc/treasures/webapps/cmk_nagios_webapps-1.1.mkp
new file mode 100644
index 0000000..c5f5083
Binary files /dev/null and b/doc/treasures/webapps/cmk_nagios_webapps-1.1.mkp differ
Module: check_mk
Branch: master
Commit: 7e48f19d8662011e852a3e61b9fa70c47c4ee277
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e48f19d866201…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Dec 19 14:30:22 2013 +0100
FIX LDAP: The LDAP Settings dialog is now disabled when the LDAP Connector is disabled
---
.werks/415 | 10 ++++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 5 +++++
3 files changed, 16 insertions(+)
diff --git a/.werks/415 b/.werks/415
new file mode 100644
index 0000000..4c9ee3b
--- /dev/null
+++ b/.werks/415
@@ -0,0 +1,10 @@
+Title: LDAP: The LDAP Settings dialog is now disabled when the LDAP Connector is disabled
+Level: 1
+Component: wato
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1387459797
+Targetversion: future
+
+
diff --git a/ChangeLog b/ChangeLog
index ef1e953..8bf8c56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -114,6 +114,7 @@
* 0389 FIX: Showing LDAP settings on site specific global settings page now...
* 0400 FIX: WATO BI editor now supports percentages for count_ok...
* 0392 FIX: LDAP: Improved error messages of LDAP configuration test...
+ * 0415 FIX: LDAP: The LDAP Settings dialog is now disabled when the LDAP Connector is disabled
Notifications:
* 0362 sms: now searching PATH for sendsms and smssend commands...
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index c896f93..2a37ef0 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -6032,6 +6032,11 @@ def mode_ldap_config(phase):
current_settings = load_configuration_settings()
+ if not userdb.connector_enabled('ldap'):
+ html.message(_('The LDAP user connector is disabled. You need to enable it to be able '
+ 'to configure the LDAP settings.'))
+ return
+
if phase == 'action':
if not html.check_transaction():
return
Module: check_mk
Branch: master
Commit: 00f19dd9091c62486979a40aa3181096ab5260eb
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00f19dd9091c62…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Dec 19 14:25:01 2013 +0100
FIX LDAP: Auth expiration plugin now checks users for being disabled (in AD)
The authentication expiration ldap sync plugin now also checks wether or not
a user has been disabled in LDAP. This only works with Active Directory based
LDAPs at the moment.
---
.werks/394 | 12 ++++++++++++
ChangeLog | 1 +
web/plugins/userdb/ldap.py | 19 ++++++++++++++++++-
3 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/.werks/394 b/.werks/394
new file mode 100644
index 0000000..2276933
--- /dev/null
+++ b/.werks/394
@@ -0,0 +1,12 @@
+Title: LDAP: Auth expiration plugin now checks users for being disabled (in AD)
+Level: 1
+Component: multisite
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1387459423
+Targetversion: future
+
+The authentication expiration ldap sync plugin now also checks wether or not
+a user has been disabled in LDAP. This only works with Active Directory based
+LDAPs at the moment.
diff --git a/ChangeLog b/ChangeLog
index 880c76d..fe0c1a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -88,6 +88,7 @@
* 0374 FIX: Fixed syntax error in exception handler of LDAP search code...
* 0375 FIX: LDAP: Now handling user-ids with umlauts...
* 0393 FIX: LDAP: Enabled paged LDAP search by default now with a page size of 1000...
+ * 0394 FIX: LDAP: Auth expiration plugin now checks users for being disabled (in AD)...
WATO:
* 0308 Multisite can now set rotation view permissions for NagVis...
diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py
index 24dd484..43c04e3 100644
--- a/web/plugins/userdb/ldap.py
+++ b/web/plugins/userdb/ldap.py
@@ -709,6 +709,15 @@ ldap_attribute_plugins['alias'] = {
# In first instance, it must parse the pw-changed field, then check wether or not
# a date has been stored in the user before and then maybe increase the serial.
def ldap_convert_auth_expire(plugin, params, user_id, ldap_user, user):
+ # Special handling for active directory: Is the user enabled / disabled?
+ if config.ldap_connection['type'] == 'ad' and ldap_user.get('useraccountcontrol'):
+ # see http://www.selfadsi.de/ads-attributes/user-userAccountControl.htm for details
+ if saveint(ldap_user['useraccountcontrol'][0]) & 2:
+ return {
+ 'locked': True,
+ 'serial': user.get('serial', 0) + 1,
+ }
+
changed_attr = params.get('attr', ldap_attr('pw_changed'))
if not changed_attr in ldap_user:
raise MKLDAPException(_('The "Authentication Expiration" attribute (%s) could not be fetched '
@@ -730,12 +739,20 @@ def ldap_convert_auth_expire(plugin, params, user_id, ldap_user, user):
return {}
+def ldap_attrs_auth_expire(params):
+ attrs = [ params.get('attr', ldap_attr('pw_changed')) ]
+
+ # Fetch user account flags to check locking
+ if config.ldap_connection['type'] == 'ad':
+ attrs.append('useraccountcontrol')
+ return attrs
+
ldap_attribute_plugins['auth_expire'] = {
'title': _('Authentication Expiration'),
'help': _('This plugin fetches all information which are needed to check wether or '
'not an already authenticated user should be deauthenticated, e.g. because '
'the password has changed in LDAP or the account has been locked.'),
- 'needed_attributes': lambda params: [ params.get('attr', ldap_attr('pw_changed')) ],
+ 'needed_attributes': ldap_attrs_auth_expire,
'convert': ldap_convert_auth_expire,
# When a plugin introduces new user attributes, it should declare the output target for
# this attribute. It can either be written to the multisites users.mk or the check_mk