v2.22 - Fixed #60 incorrect JSON request while reading latest problems

I've forgotten to update the xml to the same version as mailGraph.php :-(. Fixed with this very minor change.

README.md

@@ -1,7 +1,61 @@
-## mailGraph (v1.22)
+## Introduction ##
-Zabbix Media module and scripts for sending e-mail alerts with graphs.
+Over the years I've been using Zabbix as both personal and business solution for monitoring. One of the missing features in Zabbix itself was the ability to have graphs generated and associated to monitoring messages as well as an easy way to jump back into Zabbix when searching for monitoring information for specific events, problems or to have a direct link to the associated Zabbix item or host.
 
-**Please use the Wiki for information on how to install, configure and use MailGraph in Zabbix.**
+This initiated the development of mailGraph v1 in Zabbix 5.4 delivering an elementary solution for sending HTML enriched messages from Zabbix including graphs.
+To facilitate in a very flexible way to setup and format messages including the graphs, Twig made its introduction towards mailGraph v2, the current release branch of mailGraph.
 
-## Example message
+The below message is just an example of what MailGraph is capable of. The template engine in Twig allows for a fully customized message creation to your needs! It is also possible to add more Zabbix fields as any field is passed to Twig when accessible in Zabbix through the macro mechanism.
-[![](images/Example-mail-message-v122.png?raw=true)](images/Example-mail-message-v122.png)
+
+Note that all Zabbix host, item or screen related information is made available to Twig automatically.
+
+Example message:
+
+![Example image](https://github.com/moudsen/mailGraph/assets/16045332/0cb671d9-464f-493b-b250-15dd550fd84a)
+
+mailGraph is capable of adding several series of graphs into a single message delivering a unique experience when and how groups of graph images per the requested periods of time are added.
+Currently mailGraph supports hosts, (one or more related) items and screens (applicable to Zabbix 5.4 only).
+
+More information can be found in the Wiki.
+
+## Installation ##
+Please refer to the Wiki how to get mailGraph installed and configured on your system.
+
+## Reference websites ##
+[Extensive GERMAN installation from scratch](https://znil.net/index.php?title=Zabbix_mailGraph_installieren_-_Trigger_Alerts_Emails_mit_Grafiken) - nice work from Bernard Linz
+
+## Announcements ##
+_(2025/02/04)_
+
+Started on coding and testing mailGraph v3.
+
+_(2025/01/26)_
+
+mailGraph v2.20 now supporting Zabbix 7.0 (LTS) and Zabbix 7.2 (in particular the new API bearer token authentication method).
+
+_(2024/12/01)_
+
+As per December 2024 PHP 7 and older is no longer supported. Please upgrade to a supported PHP 8 version.
+Note that mailGraph is expected to function in older PHP versions.
+
+_(2023/11/01)_
+
+As per November 2023 the maintenance on mailGraph v2.x for Zabbix 5.x will stop in conjunction with the Zabbix lifecycle policy (https://www.zabbix.com/life_cycle_and_release_policy) as Zabbix 5 is nearing it's end of life.
+
+Principal bug fixing on mailGraph v2.x (logic failure or similar) will continue but only for Zabbix 6.x onwards.
+
+## Ideas and improvements ##
+
+I'm open to new feature requests - please raise an issue for this in this Github space.
+
+[#50 - Docker support](https://github.com/moudsen/mailGraph/issues/50) - Docker support inserted shortly after testing; will be pushed into release 3 shortly.
+
+## Special thank you ##
+I would like to express my gratitude to the following people that have actively contributed to bring bugs and improvements to my attention:
+- [pqvindesland](https://github.com/pqvindesland)
+- [BernardLinz](https://github.com/BernhardLinz)
+- [WMP](https://github.com/WMP)
+- [dima-online](https://github.com/dima-online)
+- [tadeuszkura](https://github.com/tadeuszkura)
+
+## IMPORTANT NOTE for users of mailGraph v2 and older and Zabbix versions under 6.0 ##
+As per November 2023, mailGraph is no longer maintained for Zabbix 5 and older.

config/config.json.template

@@ -1,28 +1,32 @@
 {
-    "script_baseurl": "https:\/\/domain.com\/",
+    "script_baseurl": "https:\/\/mydomain.com\/",
-    "cli_itemId": 0,
-    "cli_triggerId": 0,
     "cli_eventId": 0,
-    "cli_eventValue": 0,
     "cli_duration": 0,
-    "cli_recipient": "recipient@domain.com",
+    "cli_recipient": "recipient@mydomain.com",
     "cli_subject": "[TEST] {{ HOST_NAME|raw }}:  ({{ EVENT_SEVERITY }}) {{ EVENT_NAME|raw }}",
-    "cli_baseURL": "https:\/\/domain.com\/zabbix\/",
+    "cli_baseURL": "https:\/\/mydomain.com\/zabbix\/",
     "cli_period": "30m",
     "cli_period_header": "Last 30 minutes",
     "cli_debug": 1,
+    "cli_proxy": "",
     "zabbix_user": "alogicalusername",
     "zabbix_user_pwd": "astrongpassword",
     "zabbix_api_user": "alogicalusername",
     "zabbix_api_pwd": "astrongpassword",
-    "mail_from": "sender@domain.com",
     "subject": "{{ HOST_NAME|raw }}:  ({{ EVENT_SEVERITY }}) {{ EVENT_NAME|raw }}",
     "smtp_server": "localhost",
     "smtp_port": 25,
-    "smtp_transport": "none",
+    "smtp_security": "none",
     "smtp_strict": "yes",
+    "smtp_from_address": "mailgraph@mydomain.com",
+    "smtp_from_name": "mailGraph",
+    "smtp_reply_address": "feedback@mydomain.com",
+    "smtp_reply_name": "mailGraph response mailbox",
     "graph_match": "any",
+    "item_value_truncate": 50,
     "period": "20m",
     "period_header": "Last 20 minutes",
+    "retention_images": 7,
+    "retention_logs": 14,
     "debug": 0
 }

config/config.json.template.api_token

@@ -0,0 +1,31 @@
+{
+    "script_baseurl": "https:\/\/mydomain.com\/",
+    "cli_eventId": 0,
+    "cli_duration": 0,
+    "cli_recipient": "recipient@mydomain.com",
+    "cli_subject": "[TEST] {{ HOST_NAME|raw }}:  ({{ EVENT_SEVERITY }}) {{ EVENT_NAME|raw }}",
+    "cli_baseURL": "https:\/\/mydomain.com\/zabbix\/",
+    "cli_period": "30m",
+    "cli_period_header": "Last 30 minutes",
+    "cli_debug": 1,
+    "cli_proxy": "",
+    "zabbix_user": "alogicalusername",
+    "zabbix_user_pwd": "astrongpassword",
+    "zabbix_api_token": "TheTokenGeneratedInZabbix",
+    "subject": "{{ HOST_NAME|raw }}:  ({{ EVENT_SEVERITY }}) {{ EVENT_NAME|raw }}",
+    "smtp_server": "localhost",
+    "smtp_port": 25,
+    "smtp_security": "none",
+    "smtp_strict": "yes",
+    "smtp_from_address": "mailgraph@mydomain.com",
+    "smtp_from_name": "mailGraph",
+    "smtp_reply_address": "feedback@mydomain.com",
+    "smtp_reply_name": "mailGraph response mailbox",
+    "graph_match": "any",
+    "item_value_truncate": 50,
+    "period": "20m",
+    "period_header": "Last 20 minutes",
+    "retention_images": 7,
+    "retention_logs": 14,
+    "debug": 0
+}

config/config.json.template.multigraph

@@ -1,27 +1,29 @@
 {
-    "script_baseurl": "https:\/\/domain.com\/",
+    "script_baseurl": "https:\/\/mydomain.com\/",
-    "cli_itemId": 0,
-    "cli_triggerId": 0,
     "cli_eventId": 0,
-    "cli_eventValue": 0,
     "cli_duration": 0,
-    "cli_recipient": "recipient@domain.com",
+    "cli_recipient": "recipient@mydomain.com",
     "cli_subject": "[TEST] {{ HOST_NAME|raw }}:  ({{ EVENT_SEVERITY }}) {{ EVENT_NAME|raw }}",
-    "cli_baseURL": "https:\/\/domain.com\/zabbix\/",
+    "cli_baseURL": "https:\/\/mydomain.com\/zabbix\/",
     "cli_periods": "10m,4h,2d,7d",
     "cli_periods_headers": "Last 10 minutes,Last 4 hours,Last 2 days,Last 7 days",
     "cli_debug": 1,
+    "cli_proxy": "",
     "zabbix_user": "alogicalusername",
     "zabbix_user_pwd": "astrongpassword",
     "zabbix_api_user": "alogicalusername",
     "zabbix_api_pwd": "astrongpassword",
-    "mail_from": "sender@domain.com",
     "subject": "{{ HOST_NAME|raw }}:  ({{ EVENT_SEVERITY }}) {{ EVENT_NAME|raw }}",
     "smtp_server": "localhost",
     "smtp_port": 25,
-    "smtp_transport": "none",
+    "smtp_security": "none",
     "smtp_strict": "yes",
+    "smtp_from_address": "mailgraph@mydomain.com",
+    "smtp_from_name": "mailGraph",
+    "smtp_reply_address": "feedback@mydomain.com",
+    "smtp_reply_name": "mailGraph response mailbox",
     "graph_match": "any",
+    "item_value_truncate": 50,
     "periods": "10m,4h,2d,7d",
     "periods_headers": "Last 10 minutes,Last 4 hours,Last 2 days,Last 7 days",
     "debug": 0

config/config.php

@@ -27,7 +27,7 @@
         $content = file_get_contents($argv[1]);
         $data = json_decode($content,TRUE);
 
-        if ($data==NULL)
+        if (($data==NULL) && (sizeof($content)>2))
         {
             echo 'Invalid JSON format in config file?!'.$cCRLF;
             die;
@@ -138,4 +138,4 @@
         default:
             echo 'Unknown command?'.$cCRLF;
     }
-?>
+?>

javascript/READ.ME

@@ -0,0 +1 @@
+Issue #32 has been resolved. The javascript code now works for Zabbix 5.4, 6.0 LTS and 6.4.

javascript/zabbix.mailGraph.js

@@ -1,25 +1,42 @@
+// mailGraph v2.20
+
+// Function to test string
+function isJSON(str) {
+	try {
+		JSON.stringify(JSON.parse(str));
+		return true;
+	} catch (e) {
+		return false;
+	}
+}
+
 try {
     // Pickup parameters
     params = JSON.parse(value),
-        req = new CurlHttpRequest(),
+        req = new HttpRequest(),
         fields = {},
         resp = '',
         result = { tags: {} };
 
     // Set HTTP proxy if required
-    if (typeof params.HTTPProxy === 'string' && params.HTTPProxy.trim() !== '') { req.setProxy(params.HTTPProxy); }
+    if (typeof params.HTTPProxy === 'string' && params.HTTPProxy.trim() !== '') {
+        req.setProxy(params.HTTPProxy);
+        fields.HTTPProxy = params.HTTPProxy;
+    }
 
     // Declare output type
-    req.AddHeader('Content-Type: application/json');
+    req.addHeader('Content-Type: application/json');
 
-    // Must have fields
+    // Pick up fields relevant for mailGraph API level call while parsing/casting fields that should be integer
-    fields.itemId = params.itemId;
+    fields.itemId = params.itemId * 1;
-    fields.triggerId = params.triggerId;
+    fields.eventId = params.eventId * 1;
-    fields.eventId = params.eventId;
-    fields.eventValue = params.eventValue;
     fields.recipient = params.recipient;
     fields.baseURL = params.baseURL;
-    fields.duration = params.duration;
+    fields.duration = params.duration * 1;
+
+    if (fields.recipient.charAt(0) == '{') {
+      throw '[MailGraph Webhook] Please define recipient for the test message!';
+    }
 
     // Optional fields
     if (typeof params.graphWidth === 'string') { fields.graphWidth = params.graphWidth; }
@@ -39,22 +56,44 @@ try {
 
     // Post information to the processing script
     Zabbix.Log(4, '[MailGraph Webhook] Sending request: ' + params.URL + '?' + JSON.stringify(fields));
-    var resp = req.Post(params.URL,JSON.stringify(fields));
+    var resp = req.post(params.URL,JSON.stringify(fields));
-    Zabbix.Log(4, '[Mailgraph Webhook] Receiving response:' + resp);
+    Zabbix.Log(4, '[Mailgraph Webhook] Received response:' + resp);
 
-    // If there was an error, report it
+    // The response can be
-    if (req.Status() != 200) { throw JSON.parse(resp).errors[0]; }
+    // - did not receive status 200 as result (contains HTTP server response)
+    // - null (no response received at all)
+    // - empty string (likely no e-mail sent due to recipient issue)
+    // - not json (debugging message for troubleshooting or configuration hints)
+    // - json (contains the mail message ID sent)
 
-    // We expect the message id back from the processing script
+    if (req.getStatus() != 200) {
-    resp = JSON.parse(resp);
+       throw '[MailGraph Webhook] Processing of mailGraph.php failed: ' + resp;
-    result.tags.__message_id = resp.messageId;
+    }
+    if (resp==null) {
+      throw '[MailGraph Webhook] No response received from mailGraph.php? This should not occur (check URL and your webserver!)';
+    }
+
+    if (resp=='') {
+      throw '[MailGraph Webhook] No data received from mailGraph - please check recipient address or mailGraph log and retry.';
+    }
+
+    // Check if JSON was returned
+    if (!isJSON(resp)) {
+      throw '[MailGraph Webhook] An error has occurred during processing: ' + resp;
+    }
+
+    // We expect the message id back from the processing script response in JSON format
+    msg = JSON.parse(resp);
+
+    result.tags.__message_id = msg.messageId;
+    Zabbix.Log(4, '[MailGraph Webhook] Message sent with identification "' + msg.messageId + '"');
 
     // Pass the result back to Zabbix
     return JSON.stringify(result);
 }
 catch (error)
 {
-    // In case something went wrong in the processing, pass the error back to Zabbix
+    // In case something else went wrong in the processing, pass the error back to Zabbix
-    Zabbix.Log(127, 'MailGraph notification failed : '+error);
+    Zabbix.Log(127, 'MailGraph notification failed: '+error);
     throw 'MailGraph notification failed : '+error;
-}
+}

mailGraph.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>5.0</version>
+    <version>5.4</version>
-    <date>2021-03-10T18:50:24Z</date>
+    <date>2023-08-16T20:38:38Z</date>
     <media_types>
         <media_type>
             <name>MailGraph</name>
@@ -9,7 +9,7 @@
             <parameters>
                 <parameter>
                     <name>baseURL</name>
-                    <value>https://mydomain.com/zabbix/</value>
+                    <value>https://myzabbix.com/zabbix/</value>
                 </parameter>
                 <parameter>
                     <name>duration</name>
@@ -19,10 +19,6 @@
                     <name>eventId</name>
                     <value>{EVENT.ID}</value>
                 </parameter>
-                <parameter>
-                    <name>eventValue</name>
-                    <value>{EVENT.VALUE}</value>
-                </parameter>
                 <parameter>
                     <name>graphHeight</name>
                     <value>120</value>
@@ -36,8 +32,8 @@
                     <value/>
                 </parameter>
                 <parameter>
-                    <name>itemId</name>
+                    <name>infoTest</name>
-                    <value>{ITEM.ID}</value>
+                    <value>Test</value>
                 </parameter>
                 <parameter>
                     <name>periods</name>
@@ -59,131 +55,159 @@
                     <name>subject</name>
                     <value>{{ HOST_NAME|raw }}: ({{ EVENT_SEVERITY }}) {{ EVENT_NAME|raw }}</value>
                 </parameter>
-                <parameter>
-                    <name>triggerId</name>
-                    <value>{TRIGGER.ID}</value>
-                </parameter>
                 <parameter>
                     <name>URL</name>
-                    <value>https://mydomain.com/mailGraph.php</value>
+                    <value>https://myzabbix.com/mailGraph.php</value>
                 </parameter>
             </parameters>
-            <script>try {&#13;
+            <script>// mailGraph v2.20
-    // Pickup parameters&#13;
+
-    params = JSON.parse(value),&#13;
+// Function to test string
-        req = new CurlHttpRequest(),&#13;
+function isJSON(str) {
-        fields = {},&#13;
+	try {
-        resp = '',&#13;
+		JSON.stringify(JSON.parse(str));
-        result = { tags: {} };&#13;
+		return true;
-&#13;
+	} catch (e) {
-    // Set HTTP proxy if required&#13;
+		return false;
-    if (typeof params.HTTPProxy === 'string' &amp;&amp; params.HTTPProxy.trim() !== '') { req.setProxy(params.HTTPProxy); }&#13;
+	}
-&#13;
+}
-    // Declare output type&#13;
+
-    req.AddHeader('Content-Type: application/json');&#13;
+try {
-&#13;
+    // Pickup parameters
-    // Must have fields&#13;
+    params = JSON.parse(value),
-    fields.itemId = params.itemId;&#13;
+        req = new HttpRequest(),
-    fields.triggerId = params.triggerId;&#13;
+        fields = {},
-    fields.eventId = params.eventId;&#13;
+        resp = '',
-    fields.eventValue = params.eventValue;&#13;
+        result = { tags: {} };
-    fields.recipient = params.recipient;&#13;
+
-    fields.baseURL = params.baseURL;&#13;
+    // Set HTTP proxy if required
-    fields.duration = params.duration;&#13;
+    if (typeof params.HTTPProxy === 'string' &amp;&amp; params.HTTPProxy.trim() !== '') {
-&#13;
+        req.setProxy(params.HTTPProxy);
-    // Optional fields&#13;
+        fields.HTTPProxy = params.HTTPProxy;
-    if (typeof params.graphWidth === 'string') { fields.graphWidth = params.graphWidth; }&#13;
+    }
-    if (typeof params.graphHeight === 'string') { fields.graphHeight = params.graphHeight; }&#13;
+
-    if (typeof params.subject === 'string') { fields.subject = params.subject; }&#13;
+    // Declare output type
-    if (typeof params.showLegend === 'string') { fields.showLegend = params.showLegend; }&#13;
+    req.addHeader('Content-Type: application/json');
-    if (typeof params.periods === 'string') { fields.periods = params.periods; }&#13;
+
-    if (typeof params.periods_headers === 'string') { fields.periods_headers = params.periods_headers; }&#13;
+    // Pick up fields relevant for mailGraph API level call while parsing/casting fields that should be integer
-    if (typeof params.debug === 'string') { fields.debug = params.debug; }&#13;
+    fields.itemId = params.itemId * 1;
-&#13;
+    fields.eventId = params.eventId * 1;
-    // Add generic fields&#13;
+    fields.recipient = params.recipient;
-    Object.keys(params).forEach(function(key) {&#13;
+    fields.baseURL = params.baseURL;
-        if (key.substring(0, 4) == 'info') {&#13;
+    fields.duration = params.duration * 1;
-            fields[key] = params[key];&#13;
+
-        }&#13;
+    if (fields.recipient.charAt(0) == '{') {
-    });&#13;
+      throw '[MailGraph Webhook] Please define recipient for the test message!';
-&#13;
+    }
-    // Post information to the processing script&#13;
+
-    Zabbix.Log(4, '[MailGraph Webhook] Sending request: ' + params.URL + '?' + JSON.stringify(fields));&#13;
+    // Optional fields
-    var resp = req.Post(params.URL,JSON.stringify(fields));&#13;
+    if (typeof params.graphWidth === 'string') { fields.graphWidth = params.graphWidth; }
-    Zabbix.Log(4, '[Mailgraph Webhook] Receiving response:' + resp);&#13;
+    if (typeof params.graphHeight === 'string') { fields.graphHeight = params.graphHeight; }
-&#13;
+    if (typeof params.subject === 'string') { fields.subject = params.subject; }
-    // If there was an error, report it&#13;
+    if (typeof params.showLegend === 'string') { fields.showLegend = params.showLegend; }
-    if (req.Status() != 200) { throw JSON.parse(resp).errors[0]; }&#13;
+    if (typeof params.periods === 'string') { fields.periods = params.periods; }
-&#13;
+    if (typeof params.periods_headers === 'string') { fields.periods_headers = params.periods_headers; }
-    // We expect the message id back from the processing script&#13;
+    if (typeof params.debug === 'string') { fields.debug = params.debug; }
-    resp = JSON.parse(resp);&#13;
+
-    result.tags.__message_id = resp.messageId;&#13;
+    // Add generic fields
-&#13;
+    Object.keys(params).forEach(function(key) {
-    // Pass the result back to Zabbix&#13;
+        if (key.substring(0, 4) == 'info') {
-    return JSON.stringify(result);&#13;
+            fields[key] = params[key];
-}&#13;
+        }
-catch (error)&#13;
+    });
-{&#13;
+
-    // In case something went wrong in the processing, pass the error back to Zabbix&#13;
+    // Post information to the processing script
-    Zabbix.Log(127, 'MailGraph notification failed : '+error);&#13;
+    Zabbix.Log(4, '[MailGraph Webhook] Sending request: ' + params.URL + '?' + JSON.stringify(fields));
-    throw 'MailGraph notification failed : '+error;&#13;
+    var resp = req.post(params.URL,JSON.stringify(fields));
+    Zabbix.Log(4, '[Mailgraph Webhook] Received response:' + resp);
+
+    // The response can be
+    // - did not receive status 200 as result (contains HTTP server response)
+    // - null (no response received at all)
+    // - empty string (likely no e-mail sent due to recipient issue)
+    // - not json (debugging message for troubleshooting or configuration hints)
+    // - json (contains the mail message ID sent)
+
+    if (req.getStatus() != 200) {
+       throw '[MailGraph Webhook] Processing of mailGraph.php failed: ' + resp;
+    }
+    if (resp==null) {
+      throw '[MailGraph Webhook] No response received from mailGraph.php? This should not occur (check URL and your webserver!)';
+    }
+
+    if (resp=='') {
+      throw '[MailGraph Webhook] No data received from mailGraph - please check recipient address or mailGraph log and retry.';
+    }
+
+    // Check if JSON was returned
+    if (!isJSON(resp)) {
+      throw '[MailGraph Webhook] An error has occurred during processing: ' + resp;
+    }
+
+    // We expect the message id back from the processing script response in JSON format
+    msg = JSON.parse(resp);
+
+    result.tags.__message_id = msg.messageId;
+    Zabbix.Log(4, '[MailGraph Webhook] Message sent with identification &quot;' + msg.messageId + '&quot;');
+
+    // Pass the result back to Zabbix
+    return JSON.stringify(result);
+}
+catch (error)
+{
+    // In case something else went wrong in the processing, pass the error back to Zabbix
+    Zabbix.Log(127, 'MailGraph notification failed: '+error);
+    throw 'MailGraph notification failed : '+error;
 }</script>
             <process_tags>YES</process_tags>
-            <description>The &quot;URL&quot; must point to the location of the processing script. If a proxy is required, define &quot;HTTPProxy&quot; for the proxy address.&#13;
+            <description>The &quot;URL&quot; must point to the location of the processing script. If a proxy is required, define &quot;HTTPProxy&quot; for the proxy address.
-&#13;
+
-Customization:&#13;
+Customization:
-- &quot;graphWidth&quot; and &quot;graphWidth&quot; can be defined for the image size&#13;
+- &quot;graphWidth&quot; and &quot;graphWidth&quot; can be defined for the image size
-- &quot;showLegend&quot; can be defined to show or hide the legend of the graph&#13;
+- &quot;showLegend&quot; can be defined to show or hide the legend of the graph
-- &quot;subject&quot; can be defined for a customized subject for the mail message&#13;
+- &quot;subject&quot; can be defined for a customized subject for the mail message
-&#13;
+- &quot;periods&quot; and &quot;periods_headers&quot; can be defined for displaying multiple periods of the same graph, or
-The html.template and plain.template files can be adjusted (TWIG format).&#13;
+- &quot;period&quot; and &quot;period_header&quot; can be defined to display a single graph
-&#13;
+
+The html.template and plain.template files can be adjusted (TWIG format).
+
 More details are available at https://github.com/moudsen/mailGraph</description>
             <message_templates>
                 <message_template>
                     <event_source>TRIGGERS</event_source>
                     <operation_mode>PROBLEM</operation_mode>
                     <subject>Problem: {EVENT.NAME}</subject>
-                    <message>Problem started at {EVENT.TIME} on {EVENT.DATE}&#13;
+                    <message>Problem started at {EVENT.TIME} on {EVENT.DATE}
-Problem name: {EVENT.NAME}&#13;
+Problem name: {EVENT.NAME}
-Host: {HOST.NAME}&#13;
+Host: {HOST.NAME}
-Severity: {EVENT.SEVERITY}&#13;
+Severity: {EVENT.SEVERITY}
-Operational data: {EVENT.OPDATA}&#13;
+Operational data: {EVENT.OPDATA}
-Original problem ID: {EVENT.ID}&#13;
+Original problem ID: {EVENT.ID}
-{TRIGGER.URL}&#13;
+Trigger ID (/url): {TRIGGER.ID} {TRIGGER.URL}</message>
-&#13;
-eventId: {EVENT.ID}&#13;
-TriggerId: {TRIGGER.ID}&#13;
-itemId: {ITEM.ID]</message>
                 </message_template>
                 <message_template>
                     <event_source>TRIGGERS</event_source>
                     <operation_mode>RECOVERY</operation_mode>
-                    <subject>Resolved in {EVENT.DURATION}: {EVENT.NAME}</subject>
+                    <subject>Resolved in {EVENT.DURATION}: {EVENT.RECOVERY.NAME}</subject>
-                    <message>Problem has been resolved at {EVENT.RECOVERY.TIME} on {EVENT.RECOVERY.DATE}&#13;
+                    <message>Problem has been resolved at {EVENT.RECOVERY.TIME} on {EVENT.RECOVERY.DATE}
-Problem name: {EVENT.NAME}&#13;
+Problem name: {EVENT.RECOVERY.NAME}
-Problem duration: {EVENT.DURATION}&#13;
+Problem duration: {EVENT.DURATION}
-Host: {HOST.NAME}&#13;
+Host: {HOST.NAME}
-Severity: {EVENT.SEVERITY}&#13;
+Severity: {EVENT.SEVERITY}
-Original problem ID: {EVENT.ID}&#13;
+Original problem ID: {EVENT.ID}
-{TRIGGER.URL}&#13;
+Trigger ID: {TRIGGER.ID} {TRIGGER.URL}</message>
-&#13;
-eventId: {EVENT.ID}&#13;
-TriggerId: {TRIGGER.ID}&#13;
-itemId: {ITEM.ID]</message>
                 </message_template>
                 <message_template>
                     <event_source>TRIGGERS</event_source>
                     <operation_mode>UPDATE</operation_mode>
                     <subject>Updated problem in {EVENT.AGE}: {EVENT.NAME}</subject>
-                    <message>{USER.FULLNAME} {EVENT.UPDATE.ACTION} problem at {EVENT.UPDATE.DATE} {EVENT.UPDATE.TIME}.&#13;
+                    <message>{USER.FULLNAME} {EVENT.UPDATE.ACTION} problem at {EVENT.UPDATE.DATE} {EVENT.UPDATE.TIME}.
-{EVENT.UPDATE.MESSAGE}&#13;
+{EVENT.UPDATE.MESSAGE}
-&#13;
+
-Current problem status is {EVENT.STATUS}, age is {EVENT.AGE}, acknowledged: {EVENT.ACK.STATUS}.&#13;
+Current problem status is {EVENT.STATUS}, age is {EVENT.AGE}, acknowledged: {EVENT.ACK.STATUS}.
-&#13;
+
-eventId: {EVENT.ID}&#13;
+Event ID: {EVENT.ID}
-TriggerId: {TRIGGER.ID}&#13;
+Trigger ID: {TRIGGER.ID}</message>
-itemId: {ITEM.ID]</message>
                 </message_template>
             </message_templates>
         </media_type>

templates/html.template

@@ -81,6 +81,9 @@
     .content {
         font-size: 14px;
     }
+    .acknowledge {
+        font-size: 10px;
+    }
 </style>
 </head>
 <body>
@@ -98,7 +101,7 @@
                                 ({{ HOST_ERROR }})
 {% endif %}
                                 <br/>
-{% if EVENT_OPDATE|length > 0 %}
+{% if EVENT_OPDATA|length > 0 %}
                                 Operational data: <b>{{ EVENT_OPDATA }}</b><br/>
 {% endif %}
                                 Status: <b>{{ EVENT_STATUS }}</b><br/>
@@ -112,64 +115,95 @@
                         </td>
                     </tr>
                 </table>
+{% if ACKNOWLEDGES|length > 0 %}
+                <br/>
+{% for anAck in ACKNOWLEDGES %}
+                <table style="border:0; text-align:left;" cellpadding="5" cellspacing="0">
+                    <tr>
+                        <td class="acknowledge">
+                            <b>{{ anAck._clock }}</b><br/><em>({{ anAck.username }}, {{ anAck.name }} {{ anAck.surname }})</em><br/>[{{ anAck._actions }}]<br/>{{ anAck.message }}
+                        </td>
+                    </tr>
+                </table>
+{% endfor %}
+{% endif %}
             </td>
         </tr>
-{% if GRAPH_CID1|length > 0 %}
-        <tr>
-            <div align=justify>
-                <td align="center">
-                    <span class="graphHeader">{{ GRAPH_HEADER1 }}</span><br/>
-                    <img id="mainimage" border=0 style="width: 100%; max-width: 790px" alt="Zabbix Graph" src="{{ GRAPH_CID1 }}" />
-                </td>
-            </div>
-        </tr>
-{% endif %}
-{% if GRAPH_CID2|length > 0 %}
-        <tr>
-            <div align=justify>
-                <td align="center">
-                    <hr/>
-                    <span class="graphHeader">{{ GRAPH_HEADER2 }}</span><br/>
-                    <img id="mainimage" border=0 style="width: 100%; max-width: 790px" alt="Zabbix Graph" src="{{ GRAPH_CID2 }}" />
-                </td>
-            </div>
-        </tr>
-{% endif %}
-{% if GRAPH_CID3|length > 0 %}
-        <tr>
-            <div align=justify>
-                <td align="center">
-                    <hr/>
-                    <span class="graphHeader">{{ GRAPH_HEADER3 }}</span><br/>
-                    <img id="mainimage" border=0 style="width: 100%; max-width: 790px" alt="Zabbix Graph" src="{{ GRAPH_CID3 }}" />
-                </td>
-            </div>
-        </tr>
-{% endif %}
-{% if GRAPH_CID4|length > 0 %}
-        <tr>
-            <div align=justify>
-                <td align="center">
-                    <hr/>
-                    <span class="graphHeader">{{ GRAPH_HEADER4 }}</span><br/>
-                    <img id="mainimage" border=0 style="width: 100%; max-width: 790px" alt="Zabbix Graph" src="{{ GRAPH_CID4 }}" />
-                </td>
-            </div>
-        </tr>
-{% endif %}
         <tr>
             <td class="links">
                 <div align=center>
                     Event ID: <a href="{{ EVENTDETAILS_URL }}">{{ EVENT_ID }}</a> //
                     Trigger ID: <a href="{{ TRIGGER_URL }}">{{ TRIGGER_ID }}</a> //
                     Item ID: <a href="{{ ITEM_URL }}">{{ ITEM_ID }}</a> //
-                    Host ID: <a href="{{ HOST_URL }}">{{ HOST_ID }}</a>
+                    Host ID: <a href="{{ HOST_URL }}">{{ HOST_ID }}</a> //
+                    <a href="{{ HOST_PROBLEMS_URL }}">Problems</a>
 {% if GRAPH_ZABBIXLINK|length > 0 %}
                     // Graph ID: <a href="{{ GRAPH_ZABBIXLINK }}">{{ GRAPH_ID }}</a>
 {% endif %}
+                   // <a href="{{ ACK_URL }}">Ack</a>
                 </div>
             </td>
         </tr>
+{% for aGraph in GRAPHS_I %}
+        <tr>
+            <div align=justify>
+                <td align="center">
+                    <span class="graphHeader">{{ aGraph.HEADER }}</span><br/>
+                    <img id="mainimage" border=0 style="width: 100%; max-width: 790px" alt="Zabbix Graph" src="{{ aGraph.CID }}" />
+                </td>
+            </div>
+        </tr>
+{% endfor %}
+{% if TRIGGER_SCREEN > 0 %}
+        <tr>
+            <div align=justify>
+                <td align="center">
+                    <span class="graphHeader">{{ GRAPHS_T_HEADER }} - {{ GRAPHS_T_PERIODHEADER }}</span>
+                </td>
+            </div>
+        </tr>
+        <tr>
+            <td class="links">
+                <div align="center">
+                    Screen ID: <a href="{{ GRAPHS_T_LINK }}">{{ TRIGGER_SCREEN }}</a>
+                </div>
+            </td>
+        </tr>
+    {% for aGraph in GRAPHS_T %}
+        <tr>
+            <div align=justify>
+                <td align="center">
+                    <img id="mainimage" border=0 style="width: 100%; max-width: 790px" alt="Zabbix Graph" src="{{ aGraph.CID }}" />
+                </td>
+            </div>
+        </tr>
+    {% endfor %}
+{% endif %}
+{% if HOST_SCREEN > 0 %}
+        <tr>
+            <div align=justify>
+                <td align="center">
+                    <span class="graphHeader">{{ GRAPHS_H_HEADER }} - {{ GRAPHS_H_PERIODHEADER }}</span>
+                </td>
+            </div>
+        </tr>
+        <tr>
+            <td class="links">
+                <div align="center">
+                    Screen ID: <a href="{{ GRAPHS_H_LINK }}">{{ HOST_SCREEN }}</a>
+                </div>
+            </td>
+        </tr>
+    {% for aGraph in GRAPHS_H %}
+        <tr>
+            <div align=justify>
+                <td align="center">
+                    <img id="mainimage" border=0 style="width: 100%; max-width: 790px" alt="Zabbix Graph" src="{{ aGraph.CID }}" />
+                </td>
+            </div>
+        </tr>
+    {% endfor %}
+{% endif %}
     </table>
 </body>
-</html>
+</html>