Module: check_mk
Branch: master
Commit: 6111ffb8c69763aeaf966f7fadd0df3ccea207db
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6111ffb8c69763…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Dec 11 16:16:26 2012 +0100
apache_status agent plugin: working around problems with misconfigured apache servers
---
agents/plugins/apache_status | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status
index fd63734..fae8a7c 100755
--- a/agents/plugins/apache_status
+++ b/agents/plugins/apache_status
@@ -78,8 +78,17 @@ print '<<<apache_status>>>'
for proto, address, port in servers:
try:
# Try to fetch the status page for each server
- url = '%s://%s:%s/server-status?auto' % (proto, address, port)
- fd = urllib2.urlopen(url)
+ try:
+ fd = urllib2.urlopen(url)
+ except urllib2.URLError, e:
+ if 'SSL23_GET_SERVER_HELLO:unknown protocol' in str(e):
+ # HACK: workaround misconfigurations where port 443 is used for
+ # serving non ssl secured http
+ url = 'http://%s:%s/server-status?auto' % (address, port)
+ fd = urllib2.urlopen(url)
+ else:
+ raise
+
for line in fd.read().split('\n'):
if not line.strip():
continue
Module: check_mk
Branch: master
Commit: 84ee98f0e2ce83bf7549741dcd311d1ece918bf7
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84ee98f0e2ce83…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Dec 11 09:48:42 2012 +0100
FIX: Fixed changing own password when notifications are disabled
---
ChangeLog | 1 +
web/htdocs/wato.py | 3 ++-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7f16bd6..0adb5ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,7 @@
* Use pprint when writing global settings (makes files more readable)
* New script for settings/removing downtimes: doc/treasures/downtime
* New option when setting host downtimes for also including child hosts
+ * FIX: Fixed changing own password when notifications are disabled
WATO:
* FIX: Fixed generated manual check definitions for checks without items
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 4215894..d25fd5d 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -11178,7 +11178,8 @@ def page_user_profile():
# load the new language
load_language(config.get_language())
- if config.may('general.edit_notifications'):
+ user = users.get(config.user_id)
+ if config.may('general.edit_notifications') and user.get("notifications_enabled"):
value = forms.get_input(vs_notification_method, "notification_method")
users[config.user_id]["notification_method"] = value
Module: check_mk
Branch: master
Commit: d480298428743f9e468e49e1790ccbef99734d29
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d480298428743f…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Dec 11 09:43:54 2012 +0100
FIX: Persisting changing of folder titles when only the title has changed
---
ChangeLog | 1 +
web/htdocs/wato.py | 3 ++-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5abaf5f..7f16bd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,7 @@
WATO:
* FIX: Fixed generated manual check definitions for checks without items
like ntp_time and tcp_conn_stats
+ * FIX: Persisting changing of folder titles when only the title has changed
Event Console:
* FIX: fix exception in rules that use facility local7
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 720f7aa..4215894 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -1693,6 +1693,7 @@ def mode_editfolder(phase, new):
title = html.var_utf8("title")
if not title:
raise MKUserError("title", _("Please supply a title."))
+ title_changed = not new and title != g_folder.get('title', '')
# OS filename
if new:
@@ -1750,7 +1751,7 @@ def mode_editfolder(phase, new):
g_folder["title"] = title
- if attributes_changed:
+ if attributes_changed or title_changed:
mark_affected_sites_dirty(g_folder)
g_folder["attributes"] = attributes