[checkmk-commits] Check_MK Git: check_mk: #1156 FIX Graphs in HTML mails are now sent again where they where missing

Module: check_mk Branch: master Commit: 9a2f8a5567c882101aeb901d29a81930e7b9867b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a2f8a5567c882… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 21 16:19:16 2014 +0200 #1156 FIX Graphs in HTML mails are now sent again where they where missing A change from Tue Mar 4 prevented inclusion of PNP graphs in HTML mails in installations where the user "omdadmin" is not existant. This change fixes the problem and makes the graphs available again. --- .werks/1156 | 11 +++++++++++ ChangeLog | 5 ++++- notifications/mail | 3 +-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.werks/1156 b/.werks/1156 new file mode 100644 index 0000000..485cc26 --- /dev/null +++ b/.werks/1156 @@ -0,0 +1,11 @@ +Title: Graphs in HTML mails are now sent again where they where missing +Level: 1 +Component: notifications +Compatible: compat +Version: 1.2.5i6 +Date: 1408630645 +Class: fix + +A change from Tue Mar 4 prevented inclusion of PNP graphs in HTML mails +in installations where the user "omdadmin" is not existant. This change +fixes the problem and makes the graphs available again. diff --git a/ChangeLog b/ChangeLog index a14fdb2..cc33960 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,9 +27,9 @@ * 1006 printer_pages: add Perf-O-Meter and PNP template * 0646 brocade_fcport: the administrative states for which ports are inventorized can now be configured in WATO * 1010 chrony: new check for NTP synchronization via chrony on Linux... - * 0648 brocade_fcport: new speed calculation of isl_ports... * 1011 ibm_svc_systemstats.disk_latency: introduce levels for alerting... * 1372 cisco_vss: new check for monitoring state of Cisco Virtual Switches + * 0648 brocade_fcport: new speed calculation of isl_ports... * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries @@ -68,6 +68,9 @@ * 1153 FIX: Changed custom user attributes can now be used immediately... * 0201 FIX: Fixed error message in Rulelist of RBN... + Notifications: + * 1156 FIX: Graphs in HTML mails are now sent again where they where missing... + Event Console: * 1007 FIX: check_mkevents: fix case where events contain binary zeroes diff --git a/notifications/mail b/notifications/mail index ee136cf..8921317 100755 --- a/notifications/mail +++ b/notifications/mail @@ -324,8 +324,7 @@ def fetch_pnp_data(context, params): if not os.path.exists(path): raise GraphException('Unable to locate pnp4nagios index.php (%s)' % path) - #return os.popen('REMOTE_USER="%s" php %s %s "%s"' % (context['CONTACTNAME'], php_save_path, path, params)).read() - return os.popen('REMOTE_USER="%s" php %s %s "%s"' % ('omdadmin', php_save_path, path, params)).read() + return os.popen('REMOTE_USER="%s" php %s %s "%s"' % (context['CONTACTNAME'], php_save_path, path, params)).read() def fetch_num_sources(context): svc_desc = context['WHAT'] == 'HOST' and '_HOST_' or context['SERVICEDESC']