Module: check_mk
Branch: master
Commit: b0a125165ceafd898fed195fe7f456e3f76627d9
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0a125165ceafd…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sat Aug 13 14:52:06 2011 +0200
Multisite: play sounds in problem views, precisely
---
ChangeLog | 2 ++
web/htdocs/htmllib.py | 11 +++++++----
web/plugins/views/builtin.py | 11 ++++++-----
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1c63f90..d13ca10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -78,6 +78,8 @@
with a dict of "dirty" hosts
* Added column painter for host contacts
* Detail views of host/service now show contacts
+ * Fix playing of sounds: All problem views now have play_sounds activated,
+ all other deactivated.
WATO:
* Configration files can now be administered via the WEB UI
diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py
index f7d8440..0ac7057 100644
--- a/web/htdocs/htmllib.py
+++ b/web/htdocs/htmllib.py
@@ -722,11 +722,14 @@ class html:
return name in self.events
def play_sound(self, url):
- self.write('<object type="audio/x-wav" data="%s"
height="0" width="0">'
- '<param name="filename" value="%s">'
- '<param name="autostart"
value="true"><param name="playcount"
value="1"></object>' % (url, url))
+ self.write('<object type="audio/x-wav" data="%s"
height="0" width="0">\n'
+ '<param name="filename"
value="%s">\n'
+ '<param name="src" value="%s">\n'
+ '<param name="autostart"
value="true">\n'
+ '<param name="playcount"
value="1">\n'
+ '</object>\n' % (url, url, url))
if config.debug:
- self.write("Booom (%s)" % url)
+ self.write("(playing sound %s)" % url)
def apache_user(self):
return pwd.getpwuid( os.getuid() )[ 0 ]
diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py
index bee3110..15ef3b7 100644
--- a/web/plugins/views/builtin.py
+++ b/web/plugins/views/builtin.py
@@ -128,7 +128,7 @@ multisite_builtin_views.update({
('svc_state_age', None),
('svc_check_age', None),
('perfometer', None)],
- 'play_sounds': True,
+ 'play_sounds': False,
'public': True,
'show_filters': ['service_in_notification_period',
'optservicegroup',
@@ -646,7 +646,7 @@ multisite_builtin_views.update({
('service_icons', None),
('svc_state_age', None),
('svc_check_age', None)],
- 'play_sounds': True,
+ 'play_sounds': False,
'public': True,
'show_filters':
['service_in_notification_period',
'optservicegroup',
@@ -766,6 +766,7 @@ multisite_builtin_views.update({
('num_services_crit', 'host_crit'),
('num_services_unknown', 'host_unknown'),
('num_services_pending',
'host_pending')],
+ 'play_sounds' : True,
'public': True,
'show_filters': ['host_in_notification_period',
'hoststate',
@@ -929,7 +930,7 @@ multisite_builtin_views.update({
('num_services_crit', 'host_crit'),
('num_services_unknown', 'host_unknown'),
('num_services_pending', 'host_pending')],
- 'play_sounds': True,
+ 'play_sounds': False,
'public': True,
'show_filters': ['host_scheduled_downtime_depth',
'host_in_notification_period',
@@ -1937,7 +1938,7 @@ multisite_builtin_views.update({
('sitename_plain', None, ''),
('host_address', None, ''),
('svc_check_command', None, '')],
- 'play_sounds': True,
+ 'play_sounds': False,
'public': True,
'show_filters': ['service_in_notification_period',
'service_notifications_enabled',
@@ -2310,7 +2311,7 @@ multisite_builtin_views.update({
'painters': [('aggr_state', None, ''),
('aggr_treestate', None, ''),
('aggr_hosts', None, '')],
- 'play_sounds': False,
+ 'play_sounds': True,
'public': False,
'show_filters': ['aggr_hosts',
'aggr_name',