v2.17 - Several bugfixes - PHP8 confirmed testing - Preparations for release 3

Fix config.json.template

README.md

@@ -1,65 +1,39 @@
-## mailGraph v2.11 release ##
-_(2023/07/01)_
+## Introduction ##
+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.
 
-_This version has been verified with Zabbix 5.4 and 6.0 LTS and is expected to work with 6.4 and later (based on v2.10 testing)_
+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.
 
-Release notes
-- Added pre- and postchecking of variables to the Zabbix javascript - this will prevent the 'invalid JSON' messages and provide better feedback for errors
-- When testing MailGraph it is now possible to set the eventId to zero - a random problem will be picked up via the API
-- Zabbix Media Type XML reverted back to version 5.4 (for backwards compatibility)
+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.
 
-Modified files
-- mailGraph.php
-- mailGraph.xml
-- javascript/zabbix.mailGraph.js
+Note that all Zabbix host, item or screen related information is made available to Twig automatically.
 
-For those upgrading to the latest release without installing the media type:
-- copy new mailGraph.php over existing mailGraph.php
-- open the Media type MailGraph in Zabbix and edit the javascript
--- replace the script contents with the contents of javascript/zabbix.mailGraph.js
+Example message:
 
-Changes are in effect immediately, no need to restart any services.
+![Example image](https://github.com/moudsen/mailGraph/assets/16045332/0cb671d9-464f-493b-b250-15dd550fd84a)
 
-## mailGraph v2.10 release ##
-_(2023/06/30)_
+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).
 
-_This version has been verified with Zabbix 5.4, 6.0 LTS and 6.4._
+More information can be found in the Wiki.
 
-Minor updates to the mailGraph code
-- When not defining zabbix_api_user and zabbix_api_pwd in the configuration file the zbx_user and zbx_user_pwd wll be used
+## Installation ##
+Please refer to the Wiki how to get mailGraph installed and configured on your system.
 
-## Zabbix 6.4.x testing ##
-_(2023/06/30)_
+## Announcement - Zabbix 5.x maintenance for mailGraph end-of-life - mailGraph 3.x development in progress ##
+_(2023/11/01)_
 
-Zabbix 6.4 verification has succesfully completed.
-- Refactored code to remove deprecated and removed functions since Zabbix 6.4.0
--- Zabbix Javascript now using HttpRequest instead of CurlHttpRequest (function name changes implemented)
--- Zabbix API user.login is now based on "username" (instead of "user")
+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.
 
-Sidenotes
-- Zabbix logging still shows deprecation messages however it is believed these are internal to Zabbix and not related to mailGraph
+In conjunction mailGraph v2.x is now frozen and I'm setting up a roadmap for mailGraph v3.x starting new development in Alfa mode as November 2023. This new code is not expected to be published until start of 2024.
 
-_(2023/06/29)_
+Principal bug fixing on mailGraph v2.x (logic failure or similar) will continue but only for Zabbix 6.x onwards.
 
-Zabbix 6.4.x verification is in progress. Required intermediate release to fix one major issue (Zabbix login parameters deprecation) and some minor coding updates.
-Expect to continue with automatic configuration within the next 2 months.
+I'm open to new feature requests - please raise an issue for this in this Github space.
 
-## Zabbix 6.2.x testing ##
-_(2022/10/10)_
+## 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)
 
-Testing completed. No immediate issues found.
-
-_(2022/08/22)_
-
-Zabbix 6.2.x testing is in progress. Once completed the next effort will be to deliver on automatic configuration detection and automatic updates.
-
-## IMPORTANT NOTE ##
-As a result of a major functional change in Zabbix 5.4 (Screens no longer exist and are all moved into Dashboards) the mailGraph.screen macro no longer functions under Zabbix 5.4+. A code rewrite is in progress to deal with detecting the Zabbix version and to pick dashboard.get instead of screen.get as a source list for the graphs that should be included in the mail message.
-
-**v1.x is no longer supported; please upgrade to the current v2 release**
-**Please use the Wiki for information on how to install, configure and use MailGraph in Zabbix**
-
-## Example message
-The below message is just an example of what MailGraph is capable of. The template engine ("Twig") allows for a fully customized message creation to your needs! It is also possible to add more Zabbix fields. If you need additional fields just raise an issue ticket and ask and I'll see what I can do.
-
-[![](images/Example-mail-message-v122.png?raw=true)](images/Example-mail-message-v122.png)
+## 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,7 +1,5 @@
 {
     "script_baseurl": "https:\/\/mydomain.com\/",
-    "cli_itemId": 0,
-    "cli_triggerId": 0,
     "cli_eventId": 0,
     "cli_duration": 0,
     "cli_recipient": "recipient@mydomain.com",
@@ -15,14 +13,19 @@
     "zabbix_user_pwd": "astrongpassword",
     "zabbix_api_user": "alogicalusername",
     "zabbix_api_pwd": "astrongpassword",
-    "mail_from": "sender@mydomain.com",
     "subject": "{{ HOST_NAME|raw }}:  ({{ EVENT_SEVERITY }}) {{ EVENT_NAME|raw }}",
     "smtp_server": "localhost",
     "smtp_port": 25,
     "smtp_transport": "none",
+    "smtp_from_address": "mailgraph@mydomain.com",
+    "smtp_from_name": "mailGraph",
+    "smtp_reply_address": "feedback@mydomain.com",
+    "smtp_reply_name": "mailGraph response mailbox",
     "smtp_strict": "yes",
     "graph_match": "any",
     "period": "20m",
     "period_header": "Last 20 minutes",
+    "retention_images": 7,
+    "retention_logs": 14,
     "debug": 0
 }

config/config.json.template.multigraph

@@ -1,7 +1,5 @@
 {
     "script_baseurl": "https:\/\/mydomain.com\/",
-    "cli_itemId": 0,
-    "cli_triggerId": 0,
     "cli_eventId": 0,
     "cli_duration": 0,
     "cli_recipient": "recipient@mydomain.com",
@@ -15,11 +13,14 @@
     "zabbix_user_pwd": "astrongpassword",
     "zabbix_api_user": "alogicalusername",
     "zabbix_api_pwd": "astrongpassword",
-    "mail_from": "sender@mydomain.com",
     "subject": "{{ HOST_NAME|raw }}:  ({{ EVENT_SEVERITY }}) {{ EVENT_NAME|raw }}",
     "smtp_server": "localhost",
     "smtp_port": 25,
     "smtp_transport": "none",
+    "smtp_from_address": "mailgraph@mydomain.com",
+    "smtp_from_name": "mailGraph",
+    "smtp_reply_address": "feedback@mydomain.com",
+    "smtp_reply_name": "mailGraph response mailbox",
     "smtp_strict": "yes",
     "graph_match": "any",
     "periods": "10m,4h,2d,7d",

javascript/zabbix.mailGraph.js

@@ -1,4 +1,15 @@
-// mailGraph v2.11
+// mailGraph v2.16
+
+// 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),
@@ -16,21 +27,13 @@ try {
     // Declare output type
     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 * 1;
     fields.eventId = params.eventId * 1;
     fields.recipient = params.recipient;
     fields.baseURL = params.baseURL;
     fields.duration = params.duration * 1;
 
-    if (isNaN(fields.eventId)) {
-      throw '[MailGraph Webhook] Invalid event ID? Integer required (use actual event ID from Zabbix!)';
-    }
-
-    if (isNaN(fields.duration)) {
-      throw '[MailGraph Webhook] Invalid duration? Integer required (set to zero if unknown)!';
-    }
-
     if (fields.recipient.charAt(0) == '{') {
       throw '[MailGraph Webhook] Please define recipient for the test message!';
     }
@@ -56,20 +59,30 @@ try {
     var resp = req.post(params.URL,JSON.stringify(fields));
     Zabbix.Log(4, '[Mailgraph Webhook] Received response:' + resp);
 
-    // If blank the email address is likely incorrect
+    // 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 data received from mailGraph! Likely the email processing failed? Check mailGraph logging';
+      throw '[MailGraph Webhook] No response received from mailGraph.php? This should not occur (check URL and your webserver!)';
     }
 
-    // If there was an error, report it and stop
-    if (req.getStatus() != 200) { throw JSON.parse(resp).errors[0]; }
-
-    // If no datas returned, report it and stop
-    if (resp.charAt(0) == "!") {
-      throw '[MailGraph Webhook] No data received from mailGraph! Likely the event ID provided does not exist? Check mailGraph logging';
+    if (resp=='') {
+      throw '[MailGraph Webhook] No data received from mailGraph - please check recipient address or mailGraph log and retry.';
     }
 
-    // We expect the message id back from the processing script
+    // 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;
@@ -80,7 +93,7 @@ try {
 }
 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);
     throw 'MailGraph notification failed : '+error;
 }

mailGraph.php

@@ -8,39 +8,7 @@
     // upon an alert message.
     //
     // ------------------------------------------------------------------------------------------------------
-    // Release 1 tested with Zabbix 5.4 and 6.0 LTS
-    // ------------------------------------------------------------------------------------------------------
-    // 1.00 2021/02/26 - Mark Oudsen - MVP version, ready for distribution
-    // 1.01 2021/02/27 - Mark Oudsen - Enhanced search for associated graphs to an item // bug fixes
-    // 1.10 2021/02/27 - Mark Oudsen - Moved all configuration outside code
-    // 1.11 2021/02/28 - Mark Oudsen - Bugfixes
-    // 1.12 2021/03/01 - Mark Oudsen - Bugfixes
-    //                                 Adding mail server configuration via config.json
-    // 1.13 2021/03/01 - Mark Oudsen - Added smtp options to encrypt none,ssl,tls
-    // 1.14 2021/03/01 - Mark Oudsen - Added smtp strict certificates yes|no via config.json
-    // 1.15 2021/03/01 - Mark Oudsen - Revised relevant graph locator; allowing other item graphs if current
-    //                                 item does not have a graph associated
-    // 1.16 2021/03/02 - Mark Oudsen - Found issue with graph.get not returning graphs to requested item ids
-    //                                 Workaround programmed (fetch host graphs, search for certain itemids)
-    // 1.17 2021/03/02 - Mark Oudsen - Added ability to specify period of time displayed in the graph
-    // 1.18 2021/03/04 - Mark Oudsen - Added ability to specify Tags per trigger
-    //                                 Shorten long "lastvalue" or "prevvalue"
-    // 1.19 2021/03/05 - Mark Oudsen - Added ability to pass Zabbix 'infoXXX' parameters for TWIG template
-    // 1.20 2021/03/07 - Mark Oudsen - Production level version - leaving BETA from here on ...
-    // 1.21 2021/03/09 - Mark Oudsen - Reverted graph.get code back to original code as it was not a bug but
-    //                                 a wrongly typed requested (should be ARRAY, not comma separated)!
-    // 1.22 2021/03/10 - Mark Oudsen - Added ability to embed multiple periods (1-4) of the same graph
-    // 1.23 2021/03/12 - Mark Oudsen - Added graph support for 'Stacked', 'Pie' and 'Exploded'
-    // 1.24 2021/03/12 - Mark Oudsen - Added support for HTTP proxy
-    // 1.25 2021/03/16 - Mark Oudsen - Refactoring for optimized flow and relevant data retrieval
-    // 1.26 2021/03/19 - Mark Oudsen - Bugfixes after refactor (wrong itemId and incorrect eventValue)
-    //                                 Suppressing Zabbix username-password in log
-    // 1.27 2021/03/19 - Mark Oudsen - Added ability to define "mailGraph.screen" tag to embed graphs from
-    //                                 Added PHP informational and warnings to log for easier debug/spotting
-    // 1.28 2021/03/24 - Mark Oudsen - Added ability to specify username/password for TLS/SSL
-    // 1.29 2021/04/03 - Mark Oudsen - Bugfix due to stricter JSONRPC version check since Zabbix 5.0.10
-    //      2021/07/05 - Mark Oudsen - Minor detail added: CLI debug mode now also outputs version
-    //      2021/07/07 - Mark Oudsen - Fixed HTTPProxy typo in code (instead of HTTPPRoxy)
+    // Release 1 tested with Zabbix 5.4 and 6.0 LTS (history available on GitHub)
     // ------------------------------------------------------------------------------------------------------
     // Release 2 tested with Zabbix 5.4, 6.0 LTS and 6.4 - tested with latest Composer libraries
     // ------------------------------------------------------------------------------------------------------
@@ -51,6 +19,26 @@
     // 2.10 2023/06/30 - Mark Oudsen - Refactored deprecated code - now compatible with Zabbix 6.0 LTS, 6.4
     // 2.11 2023/07/01 - Mark Oudsen - Refactored Zabbix javascript - now capturing obvious errors
     //                                 Added ability to locate latest problems for testing purposes
+    // 2.12 2023/07/02 - Mark Oudsen - Replaced SwiftMailer with PHPMailer (based on AutoTLS)
+    // 2.13 2023/07/03 - Mark Oudsen - Bugfixes speciifally on links into Zabbix (missing context or info)
+    // 2.14 2023/07/10 - Mark Oudsen - Adding ability to set 'From'  and 'ReplyTo' addresses in configuration
+    //                                 Adding ACK_URL for utilization in the template to point to Ack page
+    //                                 Small refactor on itemId variable processing (no longer mandatory)
+    //                                 Additional logic added to random eventId to explain in case of issues
+    //                                 Fixed missing flag for fetching web url related items
+    // 2.15 2023/08/16 - Mark Oudsen - Bugfix for Zabbix 5.4 where empty or zeroed variables are no longer
+    //                                 passed by Zabbix (hence resulting in weird errors)
+    // 2.16 2023/08/16 - Mark Oudsen - Adding ability to use ACKNOWLEDGE messages in the mail message
+    // 2.17 2024/12/30 - Mark Oudsen - Fixed #47 mailData initializaton (wrong location) - BernardLinz
+    //                                 Fixed #46 invalid GraphId on trigger tag - BernardLinz
+    //                                 Fixed #44 config.json.template wrong var name - WMP
+    //                                 Fixed #45 handling of international characters - Dima-online
+    //                                 Tested with latest PHPMailer (6.9.3) and TWIG (3.11.3), PHP 7.4
+    //                                 Tested with PHP 8.3, TWIG (3.18.0)
+    // ------------------------------------------------------------------------------------------------------
+    // Release 3 placeholder for Zabbix 7.0 LTS and 7.2
+    // ------------------------------------------------------------------------------------------------------
+    // v2.17                           Testing on Zabbix 7.0 LTS (in progress), Zabbix 7.2 (in progress)
     // ------------------------------------------------------------------------------------------------------
     //
     // (C) M.J.Oudsen, mark.oudsen@puzzl.nl
@@ -59,28 +47,60 @@
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    //
+    // Notes
+    // -----
+    // 1) mailGraph is following the environmental requirements from Zabbix, supporting PHP 7.4-8.3 ad per
+    //    - https://www.zabbix.com/documentation/6.0/en/manual/installation/requirements
+    //    - https://www.zabbix.com/documentation/6.4/en/manual/installation/requirements
+    //
+    // 2) TWIG 3.18.0 is available on PHP 8 only (seemless upgrade when using composer update)
+    //
+    // 3) Testing of composer libraries updates is limited to every 6 to 12 months
+    //    - In case you encounter an issue, please raise an issue on GitHub
+    //      https://github.com/moudsen/mailGraph/issues
+    //      
+    //
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    //
+    // Roadmap
+    // -------
+    // - Automatic setup and configuration of mailGraph
+    // - Automatic code updates (CLI triggered)
+    // - Add DASHBOARD facility (SCREEN was abandoned in Zabbix 5.4
+    // - Extract Graph API functionality to seperate code unit/object
+    //
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     //
     // MAIN SEQUENCE
     // -------------
     // 1) Fetch trigger, item, host, graph, event information via Zabbix API via CURL
-    // 2) Fetch Graph(s) associated to the item/trigger (if any) via Zabbix URL login via CURL
-    // 3) Build and send mail message from template using Swift/TWIG
+    // 2) Fetch Graph(s) associated to the item/trigger (if any) via Zabbix URL via CURL
+    // 3) Build and send mail message from template using PHPmailer//TWIG
     //
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
 
     // CONSTANTS
-    $cVersion = 'v2.11';
+    $cVersion = 'v2.17';
     $cCRLF = chr(10).chr(13);
     $maskDateTime = 'Y-m-d H:i:s';
-    $maxGraphs = 4;
+    $maxGraphs = 8;
 
     // DEBUG SETTINGS
     // -- Should be FALSE for production level use
 
-    $cDebug = TRUE;           // Extended debug logging mode
+    $cDebug = TRUE;           // Extended debug logging mode, switch to FALSE for production environment
     $cDebugMail = FALSE;      // If TRUE, includes log in the mail message (html and plain text attachments)
     $showLog = FALSE;         // Display the log - !!! only use in combination with CLI mode !!!
 
@@ -90,12 +110,16 @@
 
     // INCLUDE REQUIRED LIBRARIES (Composer)
     // (configure at same location as the script is running or load in your own central library)
-    // -- swiftmailer/swiftmailer       https://swiftmailer.symfony.com/docs/introduction.html
+    // -- phpmailer/phpmailer           https://github.com/PHPMailer/PHPMailer
     // -- twig/twig                     https://twig.symfony.com/doc/3.x/templates.html
 
     // Change only required if you decide to use a local/central library, otherwise leave as is
     include(getcwd().'/vendor/autoload.php');
 
+    use PHPMailer\PHPMailer\PHPMailer;
+    use PHPMailer\PHPMailer\SMTP;
+    use PHPMailer\PHPMailer\Exception;
+
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     // Fetch the HTML source of the given URL
@@ -258,8 +282,12 @@
 
         curl_close($ch);
 
-        // Delete cookie
-        unlink($filename_cookie);
+        // Delete cookie (if exists)
+        if (file_exists($filename_cookie))
+        {
+            unlink($filename_cookie);
+            _log('- Removed cookie '.$filename_cookie);
+        }
 
         // Write file
         $fp = fopen($image_name, 'w');
@@ -431,6 +459,44 @@
         _log(': Done. Cleaned up '.$filesRemoved.' file(s), kept '.$filesKept.' file(s)');
     }
 
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Zabbix translator functions
+
+    function zabbixTStoString($linuxTime)
+    {
+        return date("Y-m-d H:i:s", $linuxTime);
+    }
+
+    function zabbixActionToString($actionMask)
+    {
+        $values = [];
+
+        if ($actionMask & 1) { $values[] = "Close problem"; }
+        if ($actionMask & 2) { $values[] = "Acknowledge event"; }
+        if ($actionMask & 4) { $values[] = "Add message"; }
+        if ($actionMask & 8) { $values[] = "Change severity"; }
+        if ($actionMask & 16) { $values[] = "Unacknowledge event"; }
+        if ($actionMask & 32) { $values[] = "Suppress event"; }
+        if ($actionMask & 64) { $values[] = "Unsuppress event"; }
+        if ($actionMask & 128) { $values[] = "Change event rank to cause"; }
+        if ($actionMask & 256) { $values[] = "Change event rank to sympton"; }
+
+        return implode(", ", $values);
+    }
+
+    function zabbixSeverityToString($severity)
+    {
+        switch ($severity) {
+            case 0: return('Not classified');
+            case 1: return('Information');
+            case 2: return('Warning');
+            case 3: return('Average');
+            case 4: return('High');
+            case 5: return('Disaster');
+        }
+    }
+
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     // Initialize ///////////////////////////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -443,6 +509,10 @@
     _log('# Configuration taken from config.json'.$cCRLF.
          json_encode(maskOutputFields($config),JSON_PRETTY_PRINT|JSON_NUMERIC_CHECK));
 
+    // --- MAIL DATA ---
+
+    $mailData = array();
+
     // --- POST DATA ---
 
     // Read POST data
@@ -464,16 +534,19 @@
             _log('<<< mailGraph '.$cVersion.' >>>');
             _log('# Invoked from CLI');
 
-            // Assumes that config.json file has the correct information
+            // Assumes that config.json file has the correct information for MANDATORY information
+
+            // DEFAULTS
+            $problemData['eventId'] = 0;
+            $problemData['duration'] = 0;
 
             // MANDATORY
-            $problemData['itemId'] = $config['cli_itemId'];
-            $problemData['eventId'] = $config['cli_eventId'];
             $problemData['recipient'] = $config['cli_recipient'];
             $problemData['baseURL'] = $config['cli_baseURL'];
-            $problemData['duration'] = $config['cli_duration'];
 
             // OPTIONAL
+            if (isset($config['cli_eventId'])) { $problemData['eventId'] = $config['cli_eventId']; }
+            if (isset($config['cli_duration'])) { $problemData['duration'] = $config['cli_duration']; }
             if (isset($config['cli_subject'])) { $problemData['subject'] = $config['cli_subject']; }
             if (isset($config['cli_period'])) { $problemData['period'] = $config['cli_period']; }
             if (isset($config['cli_period_header'])) { $problemData['period_header'] = $config['cli_period_header']; }
@@ -481,6 +554,10 @@
             if (isset($config['cli_periods_headers'])) { $problemData['periods_headers'] = $config['cli_periods_headers']; }
             if (isset($config['cli_debug'])) { $problemData['debug'] = $config['cli_debug']; }
             if (isset($config['cli_proxy'])) { $problemData['HTTPProxy'] = $config['cli_proxy']; }
+
+            // BACKWARDS COMPATIBILITY - obsolete from Zabbix 6.2 onwards
+            $problemData['itemId'] = 0;
+            if (isset($config['cli_itemId'])) { $problemData['itemId'] = $config['cli_itemId']; }
         }
 
         if (($argc>1) && ($argv[1]=='cleanup'))
@@ -513,10 +590,8 @@
          $cCRLF.json_encode($problemData,JSON_PRETTY_PRINT|JSON_NUMERIC_CHECK));
 
     // --- CHECK AND SET P_ VARIABLES ---
-    // FROM POST OR CLI DATA
 
-//    if (!isset($problemData['itemId'])) { echo "Missing ITEM ID?\n"; die; }
-//    $p_itemId = intval($problemData['itemId']);
+    // FROM POST OR CLI DATA
 
     if (!isset($problemData['eventId'])) { echo "Missing EVENT ID?\n"; die; }
     $p_eventId = intval($problemData['eventId']);
@@ -524,8 +599,8 @@
     if (!isset($problemData['recipient'])) { echo "Missing RECIPIENT?\n"; die; }
     $p_recipient = $problemData['recipient'];
 
-    if (!isset($problemData['duration'])) { echo "Missing DURATION?\n"; die; }
-    $p_duration = intval($problemData['duration']);
+    $p_duration = 0;
+    if (isset($problemData['duration'])) { $p_duration = intval($problemData['duration']); }
 
     if (!isset($problemData['baseURL'])) { echo "Missing URL?\n"; die; }
     $p_URL = $problemData['baseURL'];
@@ -562,10 +637,6 @@
     $p_smtp_port = 25;
     if (isset($config['smtp_port'])) { $p_smtp_port = $config['smtp_port']; }
 
-    $p_smtp_transport = 'none';
-    if ((isset($config['smtp_transport'])) && ($config['smtp_transport']=='tls')) { $p_smtp_transport = 'tls'; }
-    if ((isset($config['smtp_transport'])) && ($config['smtp_transport']=='ssl')) { $p_smtp_transport = 'ssl'; }
-
     $p_smtp_strict = 'yes';
     if ((isset($config['smtp_strict'])) && ($config['smtp_strict']=='no')) { $p_smtp_strict = 'no'; }
 
@@ -575,6 +646,27 @@
     $p_smtp_password = '';
     if (isset($config['smtp_password'])) { $p_smtp_password = $config['smtp_password']; }
 
+    $p_smtp_from_address = '';
+    if (isset($config['smtp_from_address'])) { $p_smtp_from_address = $config['smtp_from_address']; }
+
+    $p_smtp_from_name = 'mailGraph';
+    if (isset($config['smtp_from_name'])) { $p_smtp_from_name = $config['smtp_from_name']; }
+
+    $p_smtp_reply_address = '';
+    if (isset($config['smtp_reply_address'])) { $p_smtp_reply_address = $config['smtp_reply_address']; }
+
+    $p_smtp_reply_name = 'mailGraph feedback';
+    if (isset($config['smtp_reply_name'])) { $p_smtp_reply_name = $config['smtp_reply_name']; }
+
+    // >>> Backwards compatibility but smtp_from_address is leading (<v2.14)
+    $mailFrom = '';
+    if (isset($config['mail_from'])) { $mailFrom = $config['mail_from']; }
+
+    if (($p_smtp_from_address=='') && ($mailFrom!=''))
+    {
+        $p_smtp_from_address = $mailFrom;
+    }
+
     $p_graph_match = 'any';
     if ((isset($config['graph_match'])) && ($config['graph_match']=='exact')) { $p_graph_match = 'exact'; }
 
@@ -591,6 +683,25 @@
     $z_tmp_cookies = $z_path.'tmp/';
     $z_log_path = $z_path.'log/';
 
+    // If tmp, log, or images does not exist, create them
+    if (!is_dir($z_tmp_cookies))
+    {
+        mkdir($z_tmp_cookies);
+        _log('+ created TMP directory "'.$z_tmp_cookies.'"');
+    }
+
+    if (!is_dir($z_log_path))
+    {
+        mkdir($z_log_path);
+        _log('+ created LOG directory "'.$z_log_path.'"');
+    }
+
+    if (!is_dir($z_images_path))
+    {
+        mkdir($z_images_path);
+        _log('+ created IMAGES directory "'.$z_images_path.'"');
+    }
+
     // Zabbix user (requires Super Admin access rights to access image generator script)
     $z_user = $config['zabbix_user'];
     $z_pass = $config['zabbix_user_pwd'];
@@ -611,9 +722,6 @@
         $z_api_pass = $config['zabbix_api_pwd'];
     }
 
-    // Mail sender
-    $mailFrom = array($config['mail_from']=>'Zabbix Mailgraph');
-
     // Derived variables - do not change!
     $z_server = $p_URL;                             // Zabbix server URL from config
     $z_url_api = $z_server  ."api_jsonrpc.php";     // Zabbix API URL
@@ -632,8 +740,6 @@
     // Fetch information via API ////////////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-    $mailData = array();
-
     $mailData['BASE_URL'] = $p_URL;
     $mailData['SUBJECT'] = $p_subject;
 
@@ -665,6 +771,23 @@
 
     _log('> Token = '.$token);
 
+    // -----------------------
+    // --- LOG API VERSION ---
+    // -----------------------
+
+    _log('# Record Zabbix API version');
+
+    $request = array('jsonrpc'=>'2.0',
+                     'method'=>'apiinfo.version',
+                     'params'=>[],
+                     'id'=>nextRequestID());
+
+    $result = postJSON($z_url_api, $request);
+
+    $apiVersion = $result['result'];
+
+    _log('> API version '.$apiVersion);
+
     // -----------------------------------
     // --- IF NO EVENT ID FETCH LATEST ---
     // -----------------------------------
@@ -682,9 +805,29 @@
                          'id'=>nextRequestID());
 
         $thisProblems = postJSON($z_url_api, $request);
-        _log('> Problem data'.$cCRLF.json_encode($thisProblems,JSON_PRETTY_PRINT|JSON_NUMERIC_CHECK));
+        _log('> Problem data (recent)'.$cCRLF.json_encode($thisProblems,JSON_PRETTY_PRINT|JSON_NUMERIC_CHECK));
 
-        if (!isset($thisProblems['result'][0])) { echo '! No response data received?'.$cCRLF; die; }
+        if (!isset($thisProblems['result'][0]))
+        {
+            _log('- No response data received. Retrying with less recent problems ... ');
+
+            $request = array('jsonrpc'=>'2.0',
+                             'method'=>'problem.get',
+                             'params'=>array('output'=>'extend',
+                                             'recent'=>'false',
+                                             'limit'=>1),
+                             'auth'=>$token,
+                             'id'=>nextRequestID());
+
+            $thisProblems = postJSON($z_url_api, $request);
+            _log('> Problem data (not recent)'.$cCRLF.json_encode($thisProblems,JSON_PRETTY_PRINT|JSON_NUMERIC_CHECK));
+
+            if (!isset($thisProblems['result'][0]))
+            {
+                _log('! Cannot continue: mailGraph is unable to pick a random event via the Zabbix API. It is highly likely that no active problems exist? Please retry or determine and set an event ID manually and retry.');
+                die;
+            }
+        }
 
         $p_eventId = $thisProblems['result'][0]['eventid'];
         _log('> Picked up random last event #'.$p_eventId);
@@ -701,7 +844,8 @@
                      'params'=>array('eventids'=>$p_eventId,
                                      'output'=>'extend',
                                      'selectRelatedObject'=>'extend',
-                                     'selectSuppressionData'=>'extend'),
+                                     'selectSuppressionData'=>'extend',
+                                     'select_acknowledges'=>'extend'),
                      'auth'=>$token,
                      'id'=>nextRequestID());
 
@@ -730,6 +874,17 @@
                 break;
     }
 
+    // --- Collect and attach acknowledge messages for this event
+    if (sizeof($thisEvent['result'][0]['acknowledges']>0)) {
+        foreach($thisEvent['result'][0]['acknowledges'] as $aCount=>$anAck) {
+            $mailData['ACKNOWLEDGES'][$aCount] = $anAck;
+            $mailData['ACKNOWLEDGES'][$aCount]['_clock'] = zabbixTStoString($anAck['clock']);
+            $mailData['ACKNOWLEDGES'][$aCount]['_actions'] = zabbixActionToString($anAck['action']);
+            $mailData['ACKNOWLEDGES'][$aCount]['_old_severity'] = zabbixSeverityToString($anAck['old_severity']);
+            $mailData['ACKNOWLEDGES'][$aCount]['_new_severity'] = zabbixSeverityToString($anAck['new_severity']);
+        }
+    }
+
     $p_triggerId = $thisEvent['result'][0]['relatedObject']['triggerid'];
 
     // ------------------------
@@ -832,6 +987,7 @@
         }
     }
 
+    // If no specific itemId is requested take the first item found on the items list from the host
     if (!isset($p_itemId))
     {
         foreach($thisTrigger['result'][0]['functions'] as $aFunction)
@@ -851,7 +1007,8 @@
     $request = array('jsonrpc'=>'2.0',
                      'method'=>'item.get',
                      'params'=>array('itemids'=>$p_itemId,
-                     'output'=>'extend'),
+                         'webitems'=>'true',
+                         'output'=>'extend'),
                      'auth'=>$token,
                      'id'=>nextRequestID());
 
@@ -1195,7 +1352,7 @@
         }
     }
 
-    // Strip off any excessive elements from the end
+    // Strip off any excessive elements from the end (protection of graph generation overload on system)
 
     while (sizeof($p_periods)>$maxGraphs) { array_pop($p_periods); }
     while (sizeof($p_periods_headers)>$maxGraphs) { array_pop($p_periods_headers); }
@@ -1211,7 +1368,7 @@
     {
         if ($forceGraph>0)
         {
-            $theGraph = $forceGraphInfo;
+            $theGraph = $forceGraphInfo['result'][0];
             $theType = 'Forced';
         }
         else
@@ -1247,6 +1404,7 @@
             $graphFiles[] = $graphFile;
 
             $mailData['GRAPHS_I'][$aKey]['PATH'] = $z_images_path . $graphFile;
+            $mailData['GRAPHS_I'][$aKey]['CID'] = 'images/'.$graphFile;
             $mailData['GRAPHS_I'][$aKey]['URL'] = $z_url_image . $graphFile;
             $mailData['GRAPHS_I'][$aKey]['HEADER'] = $p_periods_headers[$aKey];
         }
@@ -1277,6 +1435,7 @@
 
             $mailData['GRAPHS_'.$varName][$aKey]['URL'] = $z_url_image . $graphFile;
             $mailData['GRAPHS_'.$varName][$aKey]['PATH'] = $z_images_path . $graphFile;
+            $mailData['GRAPHS_'.$varName][$aKey]['CID'] = 'images/'.$graphFile;
         }
 
         $mailData['GRAPHS_'.$varName.'_LINK'] = $z_server.'screens.php?elementid='.$info[0]['screen']['screenid'];
@@ -1323,7 +1482,10 @@
     $mailData['LOG_HTML'] = str_replace($cCRLF,'<br/>',$mailData['LOG_HTML']);
     $mailData['LOG_HTML'] = str_replace('<br/>','<br/>'.$cCRLF,$mailData['LOG_HTML']);
 
-    $mailData['LOG_HTML'] = '<html lang="en"><head><meta http-equiv=Content-Type content="text/html; charset=UTF-8">'.$cCRLF.
+    $mailData['LOG_HTML'] = '<html lang="en"><head><meta http-equiv=Content-Type content="text/html; charset=UTF-8"></head>'.$cCRLF.
+                            '<style type="text/css">'.$cCRLF.
+                            'body { font-family: courier, courier new, serif; font-size: 12px; }'.$cCRLF.
+                            '</style>'.$cCRLF.
                             '<body>'.$cCRLF.
                             $mailData['LOG_HTML'].$cCRLF.
                             '</body>'.$cCRLF.
@@ -1335,146 +1497,143 @@
 
     // Prepare others
 
-    $mailData['TRIGGER_URL'] = $z_server.'triggers.php?form=update&triggerid='.$mailData['TRIGGER_ID'];
-    $mailData['ITEM_URL'] = $z_server.'items.php?form=update&hostid='.$mailData['HOST_ID'].'&itemid='.$mailData['ITEM_ID'];
+    $mailData['TRIGGER_URL'] = $z_server.'triggers.php?form=update&triggerid='.$mailData['TRIGGER_ID'].'&context=host';
+    $mailData['ITEM_URL'] = $z_server.'items.php?form=update&hostid='.$mailData['HOST_ID'].'&itemid='.$mailData['ITEM_ID'].'&context=host';
     $mailData['HOST_URL'] = $z_server.'hosts.php?form=update&hostid='.$mailData['HOST_ID'];
+    $mailData['ACK_URL'] = $z_server.'zabbix.php?action=popup&popup_action=acknowledge.edit&eventids[]='.$mailData['EVENT_ID'];
     $mailData['EVENTDETAILS_URL'] = $z_server.'tr_events.php?triggerid='.$mailData['TRIGGER_ID'].'&eventid='.$mailData['EVENT_ID'];
 
     $mailData['EVENT_DURATION'] = $p_duration;
+    $mailData['HOST_PROBLEMS_URL'] = $z_server.'zabbix.php?show=1&name=&inventory%5B0%5D%5Bfield%5D=type&inventory%5B0%5D%5Bvalue%5D=&evaltype=0&tags%5B0%5D%5Btag%5D=&tags%5B0%5D%5Boperator%5D=0&tags%5B0%5D%5Bvalue%5D=&show_tags=3&tag_name_format=0&tag_priority=&show_opdata=0&show_timeline=1&filter_name=&filter_show_counter=0&filter_custom_time=0&sort=clock&sortorder=DESC&age_state=0&show_suppressed=0&unacknowledged=0&compact_view=0&details=0&highlight_row=0&action=problem.view&hostids%5B%5D='.$mailData['HOST_ID'];
 
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     // Compose & Send Message ///////////////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-    _log('# Setting up mailer');
+    _log('# Configuring Mailer');
 
-    // Do we need TLS or SSL?
+    $mail = new PHPMailer(true);
 
-    if (($p_smtp_transport=='tls') || ($p_smtp_transport=='ssl'))
+    try
     {
-        $transport = (new Swift_SmtpTransport($p_smtp_server, $p_smtp_port, $p_smtp_transport));
+        // If debugging is required change to '1'
+        $mail->SMTPDebug = 0;
 
+        // Initialize for international characters
+        $mail->CharSet = "UTF-8";
+        $mail->Encoding = "base64";
+
+	// Inialize SMTP parameters
+        $mail->isSMTP();
+        $mail->Host = $p_smtp_server;
+        $mail->Port = $p_smtp_port;
+
+        // --- Authentication required?
+        if ($p_smtp_username!="")
+        {
+            $mail->SMTPAuth = true;
+            $mail->Username = $p_smtp_username;
+            $mail->Password = $p_smtp_password;
+        }
+
+        // --- Disable strict certificate checking?
         if ($p_smtp_strict=='no')
         {
-            if ($transport instanceof \Swift_Transport_EsmtpTransport)
+            $mail->SMTPOptions = [
+                'ssl' => [ 'verify_peer' => false, 'verify_peer_name' => false, 'allow_self_signed' => true ]
+            ];
+        }
+
+        // --- Define from
+        $mail->Sender = $p_smtp_from_address;
+        $mail->SetFrom($p_smtp_from_address, $p_smtp_from_name, FALSE);
+
+        // --- Define reply-to
+        if ($p_smtp_reply_address!='')
+        {
+            $mail->clearReplyTos();
+            $mail->addReplyTo($p_smtp_reply_address, $p_smtp_reply_name);
+        }
+
+        // --- Add recipient
+        $mail->addAddress($p_recipient);
+
+        // --- Prepare embedding of the graphs by attaching and generating "cid" (content-id) information
+        function embedGraphs($graphs,$varName,$type)
+        {
+            global $mail;
+            global $mailData;
+
+            foreach($graphs as $aKey=>$anItem)
             {
-                $transport->setStreamOptions([
-                    'ssl' => ['allow_self_signed' => true,
-                              'verify_peer' => false,
-                              'verify_peer_name' => false]
-                    ]);
+                $mail->AddEmbeddedImage($mailData['GRAPHS_'.$varName][$aKey]['PATH'],
+                                        $mailData['GRAPHS_'.$varName][$aKey]['CID']);
+
+                // Add content-id marker to the identifier for ease of use in Twig
+                $mailData['GRAPHS_'.$varName][$aKey]['CID'] = 'cid:'.$mailData['GRAPHS_'.$varName][$aKey]['CID'];
+
+                _log('> Embedded graph image ('.$type.') '.$mailData['GRAPHS_'.$varName][$aKey]['URL']);
             }
         }
-        else
+
+        embedGraphs($graphFiles,'I','ITEM');
+        embedGraphs($triggerGraphs,'T','TRIGGER');
+        embedGraphs($hostGraphs,'H','HOST');
+
+        // --- Render the content with TWIG for HTML, Plain text and the Subject of the message
+        $loader = new \Twig\Loader\ArrayLoader([
+            'html' => file_get_contents($z_template_path.'html.template'),
+            'plain' => file_get_contents($z_template_path.'plain.template'),
+            'subject' => $mailData['SUBJECT'],
+        ]);
+
+        $twig = new \Twig\Environment($loader);
+
+        $bodyHTML = $twig->render('html', $mailData);
+        $bodyPlain = $twig->render('plain', $mailData);
+        $mailSubject = $twig->render('subject', $mailData);
+
+        // --- Attach debug log processing?
+        if (($cDebugMail) || (isset($problemData['debug'])))
         {
-            if ($transport instanceof \Swift_Transport_EsmtpTransport)
-            {
-                $transport->setStreamOptions([
-                    'ssl' => ['allow_self_signed' => false,
-                              'verify_peer' => true,
-                              'verify_peer_name' => true]
-                ]);
-            }
+            _log('# Attaching logs to mail message');
+
+            $mail->addStringAttachment($mailData['LOG_HTML'],'log.html');
+            $mail->addStringAttachment($mailData['LOG_PLAIN'],'log.txt');
         }
-    }
-    else
-    {
-        $transport = (new Swift_SmtpTransport($p_smtp_server, $p_smtp_port));
-    }
 
-    // Username/password?
+        // ---Fill body and subject and mark as HTML while also supplying plain text option alternative
+        // Note: Not using PHPMailer option for automatic text/plain generation (by design)
+        $mail->Body = $bodyHTML;
+        $mail->isHTML(true);
+        $mail->AltBody = $bodyPlain;
+        $mail->Subject = $mailSubject;
 
-    if ($p_smtp_username!='') { $transport->setUsername($p_smtp_username); }
-    if ($p_smtp_password!='') { $transport->setPassword($p_smtp_password); }
-
-    // Start actual mail(er)
-
-    $mailer = new Swift_Mailer($transport);
-
-    $message = (new Swift_Message());
-
-    // --- Fetch mailer ID from this message (no Swift function available for it ...)
-    // --- "Message-ID: <...id...@swift.generated>"
-
-    $content = $message->toString();
-    $lines = explode(chr(10),$content);
-    $firstLine = $lines[0];
-    $idParts = explode(' ',$firstLine);
-    $messageId = substr($idParts[1],1,-2);
-
-    _log('# Message ID = '.$messageId);
-
-    // Build parts for HTML and PLAIN
-
-    _log('# Processing templates');
-    _log('+ '.$z_template_path.'html.template');
-    _log('+ '.$z_template_path.'plain.template');
-
-    $loader = new \Twig\Loader\ArrayLoader([
-        'html' => file_get_contents($z_template_path.'html.template'),
-        'plain' => file_get_contents($z_template_path.'plain.template'),
-        'subject' => $mailData['SUBJECT'],
-    ]);
-
-    $twig = new \Twig\Environment($loader);
-
-    // --- Embed the images
-
-    function embedGraphs($graphs,$varName,$type)
-    {
-        global $message;
-        global $mailData;
-
-        foreach($graphs as $aKey=>$anItem)
+        // --- Send the message
+        if (!$mail->send())
         {
-            $mailData['GRAPHS_'.$varName][$aKey]['CID'] = $message->embed(Swift_Image::fromPath($mailData['GRAPHS_'.$varName][$aKey]['PATH']));
-            _log('> Embedded graph image ('.$type.') '.$mailData['GRAPHS_'.$varName][$aKey]['PATH']);
+            _log("! Failed to send mail message");
+            echo "! Failed to send mail message. Likely an issue with the recipient email address?".$cCRLF;
+            echo "+ Mailer error: ".$mail->ErrorInfo.$cCRLF;
         }
-    }
 
-    embedGraphs($graphFiles,'I','ITEM');
-    embedGraphs($triggerGraphs,'T','TRIGGER');
-    embedGraphs($hostGraphs,'H','HOST');
+        // --- Obtain message ID
+        $messageId = $mail->getlastMessageID();
+        _log('# Message ID = '.$messageId);
 
-    // --- Render the content
-
-    $bodyHTML = $twig->render('html', $mailData);
-    $bodyPlain = $twig->render('plain', $mailData);
-    $mailSubject = $twig->render('subject', $mailData);
-
-    // Prepare message
-
-    $message->setSubject($mailSubject)
-            ->setFrom($mailFrom)
-            ->setTo($p_recipient)
-            ->setBody($bodyHTML, 'text/html')
-            ->addPart($bodyPlain, 'text/plain');
-
-    if (($cDebugMail) || (isset($problemData['debug'])))
-    {
-        _log('# Attaching logs to mail message');
-
-        $attachLogHTML = new Swift_Attachment($mailData['LOG_HTML'], 'log.html', 'text/html');
-        $message->attach($attachLogHTML);
-
-        $attachLogPlain = new Swift_Attachment($mailData['LOG_PLAIN'], 'log.txt', '/text/plain');
-        $message->attach($attachLogPlain);
-    }
-
-    // Send message
-
-    $result = $mailer->send($message);
-
-    // Return Event TAG information for Zabbix
-
-    $response = array('messageId'=>$messageId);
-
-    if ($response=="")
-    {
-        _log("! Failed to send mail message");
-        echo "! Failed to send mail message. Likely an issue with the recipient email address?".$cCRLF;
-    } else {
+        // --- Return Event TAG information for Zabbix to store with Zabbix event
+        $response = array('messageId'=>$messageId);
         echo json_encode($response).$cCRLF;
+    } catch (phpmailerException $e)
+    {
+       echo "! Failed to send message".$cCRLF;
+       echo "! phpMailer error message: ".$e->getMessage().$cCRLF;
+       _log("! phpMailer failed: ".$e->getMessage());
+    } catch (Exception $e)
+    {
+       echo "! Failed to send message".$cCRLF;
+       echo "! Error message: ".$e->getMessage().$cCRLF;
+       _log("! Failed: ".$e->getMessage());
     }
 
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1485,14 +1644,16 @@
 
     if (($cDebug) || (isset($problemData['debug'])))
     {
+        // Prevent duplicate dump of log information
         unset($mailData['LOG_HTML']);
         unset($mailData['LOG_PLAIN']);
 
+        // Attach the collected information
         $content = implode(chr(10),$logging).$cCRLF.$cCRLF.'=== VALUES AVAILABLE FOR TWIG TEMPLATE ==='.$cCRLF.$cCRLF.json_encode($mailData,JSON_PRETTY_PRINT|JSON_NUMERIC_CHECK);
         $content = str_replace(chr(13),'',$content);
 
+        // Save to unique log file
         $logName = 'log.'.$p_eventId.'.'.date('YmdHis').'.dump';
-
         file_put_contents($z_log_path.$logName,$content);
         _log('= Log stored to '.$z_log_path.$logName);
     }

mailGraph.xml

@@ -1,198 +1,215 @@
-zabbix_export:
-  version: '5.4'
-  date: '2023-07-01T10:54:39Z'
-  media_types:
-    -
-      name: MailGraph
-      type: WEBHOOK
-      parameters:
-        -
-          name: baseURL
-          value: 'https://myzabbix.example.com/'
-        -
-          name: duration
-          value: '{EVENT.DURATION}'
-        -
-          name: eventId
-          value: '{EVENT.ID}'
-        -
-          name: graphHeight
-          value: '120'
-        -
-          name: graphWidth
-          value: '300'
-        -
-          name: HTTPProxy
-          value: ''
-        -
-          name: infoTest
-          value: Test
-        -
-          name: itemId
-          value: '{ITEM.ID}'
-        -
-          name: periods
-          value: '10m,4h,1d,7d'
-        -
-          name: periods_headers
-          value: 'Last 10 minutes,Last 4 hours,Last day,Last 7 days'
-        -
-          name: recipient
-          value: '{ALERT.SENDTO}'
-        -
-          name: showLegend
-          value: '0'
-        -
-          name: subject
-          value: '{{ HOST_NAME|raw }}: ({{ EVENT_SEVERITY }}) {{ EVENT_NAME|raw }}'
-        -
-          name: URL
-          value: 'https://myzabbix.example.com/mailGraph.php'
-      script: |
-        // mailGraph v2.11
-        try {
-            // Pickup parameters
-            params = JSON.parse(value),
-                req = new HttpRequest(),
-                fields = {},
-                resp = '',
-                result = { tags: {} };
-        
-            // Set HTTP proxy if required
-            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');
-        
-            // Must have fields
-            fields.itemId = params.itemId * 1;
-            fields.eventId = params.eventId * 1;
-            fields.recipient = params.recipient;
-            fields.baseURL = params.baseURL;
-            fields.duration = params.duration * 1;
-        
-            if (isNaN(fields.eventId)) {
-              throw '[MailGraph Webhook] Invalid event ID? Integer required (use actual event ID from Zabbix!)';
-            }
-        
-            if (isNaN(fields.duration)) {
-              throw '[MailGraph Webhook] Invalid duration? Integer required (set to zero if unknown)!';
-            }
-        
-            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; }
-            if (typeof params.graphHeight === 'string') { fields.graphHeight = params.graphHeight; }
-            if (typeof params.subject === 'string') { fields.subject = params.subject; }
-            if (typeof params.showLegend === 'string') { fields.showLegend = params.showLegend; }
-            if (typeof params.periods === 'string') { fields.periods = params.periods; }
-            if (typeof params.periods_headers === 'string') { fields.periods_headers = params.periods_headers; }
-            if (typeof params.debug === 'string') { fields.debug = params.debug; }
-        
-            // Add generic fields
-            Object.keys(params).forEach(function(key) {
-                if (key.substring(0, 4) == 'info') {
-                    fields[key] = params[key];
-                }
-            });
-        
-            // 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));
-            Zabbix.Log(4, '[Mailgraph Webhook] Received response:' + resp);
-        
-            // If blank the email address is likely incorrect
-            if (resp==null) {
-              throw '[MailGraph Webhook] No data received from mailGraph! Likely the email processing failed? Check mailGraph logging';
-            }
-        
-            // If there was an error, report it and stop
-            if (req.getStatus() != 200) { throw JSON.parse(resp).errors[0]; }
-        
-            // If no datas returned, report it and stop
-            if (resp.charAt(0) == "!") {
-              throw '[MailGraph Webhook] No data received from mailGraph! Likely the event ID provided does not exist? Check mailGraph logging';
-            }
-        
-            // We expect the message id back from the processing script
-            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
-            Zabbix.Log(127, 'MailGraph notification failed: '+error);
-            throw 'MailGraph notification failed : '+error;
-        }
-      process_tags: 'YES'
-      description: |
-        The "URL" must point to the location of the processing script. If a proxy is required, define "HTTPProxy" for the proxy address.
-        
-        Customization:
-        - "graphWidth" and "graphWidth" can be defined for the image size
-        - "showLegend" can be defined to show or hide the legend of the graph
-        - "subject" can be defined for a customized subject for the mail message
-        - "periods" and "periods_headers" can be defined for displaying multiple periods of the same graph, or
-        - "period" and "period_header" can be defined to display a single graph
-        
-        The html.template and plain.template files can be adjusted (TWIG format).
-        
-        More details are available at https://github.com/moudsen/mailGraph
-      message_templates:
-        -
-          event_source: TRIGGERS
-          operation_mode: PROBLEM
-          subject: 'Problem: {EVENT.NAME}'
-          message: |
-            Problem started at {EVENT.TIME} on {EVENT.DATE}
-            Problem name: {EVENT.NAME}
-            Host: {HOST.NAME}
-            Severity: {EVENT.SEVERITY}
-            Operational data: {EVENT.OPDATA}
-            Original problem ID: {EVENT.ID}
-            {TRIGGER.URL}
-            
-            eventId: {EVENT.ID}
-            TriggerId: {TRIGGER.ID}
-            itemId: {ITEM.ID]
-        -
-          event_source: TRIGGERS
-          operation_mode: RECOVERY
-          subject: 'Resolved in {EVENT.DURATION}: {EVENT.RECOVERY.NAME}'
-          message: |
-            Problem has been resolved at {EVENT.RECOVERY.TIME} on {EVENT.RECOVERY.DATE}
-            Problem name: {EVENT.RECOVERY.NAME}
-            Problem duration: {EVENT.DURATION}
-            Host: {HOST.NAME}
-            Severity: {EVENT.SEVERITY}
-            Original problem ID: {EVENT.ID}
-            {TRIGGER.URL}
-            
-            eventId: {EVENT.ID}
-            TriggerId: {TRIGGER.ID}
-            itemId: {ITEM.ID]
-        -
-          event_source: TRIGGERS
-          operation_mode: UPDATE
-          subject: 'Updated problem in {EVENT.AGE}: {EVENT.NAME}'
-          message: |
-            {USER.FULLNAME} {EVENT.UPDATE.ACTION} problem at {EVENT.UPDATE.DATE} {EVENT.UPDATE.TIME}.
-            {EVENT.UPDATE.MESSAGE}
-            
-            Current problem status is {EVENT.STATUS}, age is {EVENT.AGE}, acknowledged: {EVENT.ACK.STATUS}.
-            
-            eventId: {EVENT.ID}
-            TriggerId: {TRIGGER.ID}
-            itemId: {ITEM.ID]
+<?xml version="1.0" encoding="UTF-8"?>
+<zabbix_export>
+    <version>5.4</version>
+    <date>2023-08-16T20:38:38Z</date>
+    <media_types>
+        <media_type>
+            <name>MailGraph</name>
+            <type>WEBHOOK</type>
+            <parameters>
+                <parameter>
+                    <name>baseURL</name>
+                    <value>https://myzabbix.com/zabbix/</value>
+                </parameter>
+                <parameter>
+                    <name>duration</name>
+                    <value>{EVENT.DURATION}</value>
+                </parameter>
+                <parameter>
+                    <name>eventId</name>
+                    <value>{EVENT.ID}</value>
+                </parameter>
+                <parameter>
+                    <name>graphHeight</name>
+                    <value>120</value>
+                </parameter>
+                <parameter>
+                    <name>graphWidth</name>
+                    <value>300</value>
+                </parameter>
+                <parameter>
+                    <name>HTTPProxy</name>
+                    <value/>
+                </parameter>
+                <parameter>
+                    <name>infoTest</name>
+                    <value>Test</value>
+                </parameter>
+                <parameter>
+                    <name>periods</name>
+                    <value>10m,4h,1d,7d</value>
+                </parameter>
+                <parameter>
+                    <name>periods_headers</name>
+                    <value>Last 10 minutes,Last 4 hours,Last day,Last 7 days</value>
+                </parameter>
+                <parameter>
+                    <name>recipient</name>
+                    <value>{ALERT.SENDTO}</value>
+                </parameter>
+                <parameter>
+                    <name>showLegend</name>
+                    <value>0</value>
+                </parameter>
+                <parameter>
+                    <name>subject</name>
+                    <value>{{ HOST_NAME|raw }}: ({{ EVENT_SEVERITY }}) {{ EVENT_NAME|raw }}</value>
+                </parameter>
+                <parameter>
+                    <name>URL</name>
+                    <value>https://myzabbix.com/mailGraph.php</value>
+                </parameter>
+            </parameters>
+            <script>// mailGraph v2.16
 
+// 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 HttpRequest(),
+        fields = {},
+        resp = '',
+        result = { tags: {} };
+
+    // Set HTTP proxy if required
+    if (typeof params.HTTPProxy === 'string' &amp;&amp; params.HTTPProxy.trim() !== '') {
+        req.setProxy(params.HTTPProxy);
+        fields.HTTPProxy = params.HTTPProxy;
+    }
+
+    // Declare output type
+    req.addHeader('Content-Type: application/json');
+
+    // Pick up fields relevant for mailGraph API level call while parsing/casting fields that should be integer
+    fields.itemId = params.itemId * 1;
+    fields.eventId = params.eventId * 1;
+    fields.recipient = params.recipient;
+    fields.baseURL = params.baseURL;
+    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; }
+    if (typeof params.graphHeight === 'string') { fields.graphHeight = params.graphHeight; }
+    if (typeof params.subject === 'string') { fields.subject = params.subject; }
+    if (typeof params.showLegend === 'string') { fields.showLegend = params.showLegend; }
+    if (typeof params.periods === 'string') { fields.periods = params.periods; }
+    if (typeof params.periods_headers === 'string') { fields.periods_headers = params.periods_headers; }
+    if (typeof params.debug === 'string') { fields.debug = params.debug; }
+
+    // Add generic fields
+    Object.keys(params).forEach(function(key) {
+        if (key.substring(0, 4) == 'info') {
+            fields[key] = params[key];
+        }
+    });
+
+    // 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));
+    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.
+
+Customization:
+- &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
+- &quot;subject&quot; can be defined for a customized subject for the mail message
+- &quot;periods&quot; and &quot;periods_headers&quot; can be defined for displaying multiple periods of the same graph, or
+- &quot;period&quot; and &quot;period_header&quot; can be defined to display a single graph
+
+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}
+Problem name: {EVENT.NAME}
+Host: {HOST.NAME}
+Severity: {EVENT.SEVERITY}
+Operational data: {EVENT.OPDATA}
+Original problem ID: {EVENT.ID}
+Trigger ID (/url): {TRIGGER.ID} {TRIGGER.URL}</message>
+                </message_template>
+                <message_template>
+                    <event_source>TRIGGERS</event_source>
+                    <operation_mode>RECOVERY</operation_mode>
+                    <subject>Resolved in {EVENT.DURATION}: {EVENT.RECOVERY.NAME}</subject>
+                    <message>Problem has been resolved at {EVENT.RECOVERY.TIME} on {EVENT.RECOVERY.DATE}
+Problem name: {EVENT.RECOVERY.NAME}
+Problem duration: {EVENT.DURATION}
+Host: {HOST.NAME}
+Severity: {EVENT.SEVERITY}
+Original problem ID: {EVENT.ID}
+Trigger ID: {TRIGGER.ID} {TRIGGER.URL}</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}.
+{EVENT.UPDATE.MESSAGE}
+
+Current problem status is {EVENT.STATUS}, age is {EVENT.AGE}, acknowledged: {EVENT.ACK.STATUS}.
+
+Event ID: {EVENT.ID}
+Trigger ID: {TRIGGER.ID}</message>
+                </message_template>
+            </message_templates>
+        </media_type>
+    </media_types>
+</zabbix_export>

templates/html.template

@@ -81,6 +81,9 @@
     .content {
         font-size: 14px;
     }
+    .acknowledge {
+        font-size: 10px;
+    }
 </style>
 </head>
 <body>
@@ -112,6 +115,18 @@
                         </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>
         <tr>
@@ -120,10 +135,12 @@
                     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>
@@ -189,4 +206,4 @@
 {% endif %}
     </table>
 </body>
-</html>
+</html>