v2.12 updates

Amended README with context and background while cleaning up historical items.

README.md

@@ -1,16 +1,84 @@
-## mailGraph (v1.28)
+## 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.
 
-## UPGRADE NOTES
+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. Example: `{ITEM.ID}`.
-### v1.27
-If you upgrade to v1.27 please be aware of the additional features for adding Tags to Trigger and Host to add additional graphs and the associated `html.template` updates that come alone with it (otherwise the new graphs will not show ...).
 
-### v1.25 and higher
+Note that all Zabbix host, item or screen related information is made available to Twig automatically.
-Template data provisioning and code has fundamentally changed. If you upgrade from an earlier version as v1.25, make sure you understand the changes in templates/html.template (now making use of arrays for lists of items).
 
-## Example message
+Example message:
-The below message is just an example of what MailGraph is capable of. The template engine used ("Twig") however allows for a fully customized message creation to your needs!
 
 [![](images/Example-mail-message-v122.png?raw=true)](images/Example-mail-message-v122.png)
+
+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.
+
+## mailGraph v2.12 release ##
+_(2023/07/02)_
+
+_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)_
+
+Release notes
+- Replaced Swiftmailer with PHPMailer
+- Configuration option "smtp_transport" removed (using PHPMailer AutoTLS)
+- Code cleanup (markup and obsolete related parts)
+- Addressed any PHP message (deprecation or error) - mailGraph debug output is now "clean" in PHP 7.4.x and PHP 8.2.x
+- Increased maximum number of graphs from 4 to 8
+
+## mailGraph v2.11 release ##
+_(2023/07/01)_
+
+_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)_
+
+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)
+
+Modified files
+- mailGraph.php
+- mailGraph.xml
+- javascript/zabbix.mailGraph.js
+
+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
+
+Changes are in effect immediately, no need to restart any services.
+
+## mailGraph v2.10 release ##
+_(2023/06/30)_
+
+_This version has been verified with Zabbix 5.4, 6.0 LTS and 6.4, PHP 7.4 and 8.2 and recent versions of libraries used via composer._
+
+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
+
+## Zabbix 6.4.x testing ##
+_(2023/06/30)_
+
+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")
+
+Sidenotes
+- Zabbix logging still shows deprecation messages however it is believed these are internal to Zabbix and not related to mailGraph
+
+_(2023/06/29)_
+
+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.
+
+## IMPORTANT NOTE for users of mailGraph v1 and Zabbix versions under 5.4 ##
+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**

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;

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,7 +1,8 @@
+// mailGraph v2.12
 try {
     // Pickup parameters
     params = JSON.parse(value),
-        req = new CurlHttpRequest(),
+        req = new HttpRequest(),
         fields = {},
         resp = '',
         result = { tags: {} };
@@ -13,14 +14,26 @@ try {
     }
 
     // Declare output type
-    req.AddHeader('Content-Type: application/json');
+    req.addHeader('Content-Type: application/json');
 
     // Must have fields
-    fields.itemId = params.itemId;
+    fields.itemId = params.itemId * 1;
-    fields.eventId = params.eventId;
+    fields.eventId = params.eventId * 1;
     fields.recipient = params.recipient;
     fields.baseURL = params.baseURL;
-    fields.duration = params.duration;
+    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; }
@@ -40,15 +53,27 @@ 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
+    // If blank the email address is likely incorrect
-    if (req.Status() != 200) { throw JSON.parse(resp).errors[0]; }
+    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
-    resp = JSON.parse(resp);
+    msg = JSON.parse(resp);
-    result.tags.__message_id = resp.messageId;
+
+    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);
@@ -56,6 +81,6 @@ try {
 catch (error)
 {
     // In case something 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.php

@@ -8,6 +8,8 @@
     // 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
@@ -36,6 +38,20 @@
     // 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 2 tested with Zabbix 5.4, 6.0 LTS and 6.4 - tested with latest Composer libraries
+    // ------------------------------------------------------------------------------------------------------
+    // 2.00 2021/12/16 - Mark Oudsen - itemId not always provisioned by Zabbix
+    //                                 Several fixes on warning - several small bug fixes
+    // 2.01 2021/12/16 - Mark Oudsen - Screens are no longer available - reverting to using Dashboards now
+    // 2.02 2022/01/30 - Mark Oudsen - Added cleanup routine for old logs and images
+    // 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/xx - Mark Oudsen - Replaced SwiftMailer with PHPMailer (based on AutoTLS)
     // ------------------------------------------------------------------------------------------------------
     //
     // (C) M.J.Oudsen, mark.oudsen@puzzl.nl
@@ -44,6 +60,19 @@
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    //
+    // 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
+    //
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     //
@@ -57,27 +86,35 @@
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
 
     // CONSTANTS
-
+    $cVersion = 'v2.12';
-    $cVersion = 'v1.28';
     $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 !!!
 
+    // Limit server level output errors
+
+    error_reporting(E_ERROR | E_PARSE);
+
     // INCLUDE REQUIRED LIBRARIES (Composer)
     // (configure at same location as the script is running or load in your own central library)
+    // -- phpmailer/phpmailer           https://github.com/PHPMailer/PHPMailer
     // -- swiftmailer/swiftmailer       https://swiftmailer.symfony.com/docs/introduction.html
     // -- 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
@@ -99,23 +136,24 @@
         $ch = curl_init();
 
         // Set options
-        curl_setopt($ch, CURLOPT_USERAGENT, 'Zabbix-mailGraph - '.$cVersion);
 
         if ((isset($HTTPProxy)) && ($HTTPProxy!=''))
         {
-            _log('% Using proxy: '.$HTTPProxy);
+            if ($cDebug) { _log('% Using proxy: '.$HTTPProxy); }
             curl_setopt($ch, CURLOPT_PROXY, $HTTPProxy);
         }
 
         curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 20);
 
+        curl_setopt($ch, CURLOPT_POST, TRUE);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($data));
+
         curl_setopt($ch, CURLOPT_URL, $url);
         curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type:application/json'));
-        curl_setopt($ch, CURLOPT_POST, TRUE);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
-        curl_setopt($ch, CURLOPT_POSTFIELDS,
+
-                         json_encode($data,JSON_PRETTY_PRINT|JSON_NUMERIC_CHECK));
+        curl_setopt($ch, CURLOPT_USERAGENT, 'Zabbix-mailGraph - '.$cVersion);
 
         // Execute Curl
         $data = curl_exec($ch);
@@ -124,9 +162,10 @@
         {
             _log('! Failed: '.curl_error($ch));
 
-            $data = 'An error occurred while retreiving the requested page.'.$cCRLF;
+            $data = array();
-            $data .= 'Requested page = '.$url.$cCRLF;
+            $data[] = 'An error occurred while retreiving the requested page.';
-            $data .= 'Error = '.curl_error($ch).$cCRLF;
+            $data[] .= 'Requested page = '.$url;
+            $data[] .= 'Error = '.curl_error($ch);
         }
         else
         {
@@ -238,8 +277,12 @@
 
         curl_close($ch);
 
-        // Delete 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');
@@ -377,6 +420,40 @@
         return($info);
     }
 
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Cleanup 'path': remove files with 'ext' older than 'daysOld'
+
+    function cleanupDir($path, $ext, $daysOld)
+    {
+        _log('- Scanning "'.$path.'"');
+
+        $files = glob($path.'/*'.$ext);
+        $now = time();
+
+        $filesRemoved = 0;
+        $filesKept = 0;
+
+        foreach ($files as $file)
+        {
+            if (is_file($file))
+            {
+                if ($now - filemtime($file) >= (60 * 60 * 24 * $daysOld))
+                {
+                    _log('> Removing "'.$file.'"');
+                    unlink($file);
+                    $filesRemoved++;
+                }
+                else
+                {
+                    $filesKept++;
+                }
+            }
+        }
+
+        _log(': Done. Cleaned up '.$filesRemoved.' file(s), kept '.$filesKept.' file(s)');
+    }
+
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     // Initialize ///////////////////////////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -404,6 +481,10 @@
     {
         if (($argc>1) && ($argv[1]=='test'))
         {
+            // Switch on CLI log display
+            $showLog = TRUE;
+
+            _log('<<< mailGraph '.$cVersion.' >>>');
             _log('# Invoked from CLI');
 
             // Assumes that config.json file has the correct information
@@ -423,9 +504,31 @@
             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']; }
+        }
 
+        if (($argc>1) && ($argv[1]=='cleanup'))
+        {
             // Switch on CLI log display
             $showLog = TRUE;
+
+            // Check for configuration of retention period for images and logs
+            _log('<<< mailGraph '.$cVersion.' >>>');
+            _log('# Invoked from CLI');
+
+            // Set defaults
+            $retImages = 30;
+            $retLogs = 14;
+
+            // Check if configured settings
+            if (isset($config['retention_images'])) { $retImages = intval($config['retention_images']); }
+            if (isset($config['retention_logs'])) { $retLogs = intval($config['retention_logs']); }
+
+            _log('Cleaning up IMAGES ('.$retImages.' days) and LOGS ('.$retLogs.' days)');
+
+            cleanupDir(getcwd().'/images', '.png', $retImages);
+            cleanupDir(getcwd().'/log', '.dump', $retLogs);
+
+            exit(0);
         }
     }
 
@@ -435,9 +538,6 @@
     // --- 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']);
-
     if (!isset($problemData['eventId'])) { echo "Missing EVENT ID?\n"; die; }
     $p_eventId = intval($problemData['eventId']);
 
@@ -465,7 +565,7 @@
     $p_period = '48h';
     if (isset($problemData['period'])) { $p_period = $problemData['period']; }
 
-    if (isset($problemData['HTTPProxy'])) { $HTTPProxy = $problemData['HTTPPRoxy']; }
+    if (isset($problemData['HTTPProxy'])) { $HTTPProxy = $problemData['HTTPProxy']; }
 
     // DYNAMIC VARIABLES FROM ZABBIX
 
@@ -482,10 +582,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'; }
 
@@ -516,12 +612,23 @@
     $z_pass = $config['zabbix_user_pwd'];
 
     // Zabbix API user (requires Super Admin access rights)
+    // --- Copy from Zabbix user and override when defined in configuration
     // TODO: Check if information retreival can be done with less rigths
+    $z_api_user = $z_user;
+    $z_api_pass = $z_pass;
+
+    if (isset($config['zabbix_api_user']))
+    {
         $z_api_user = $config['zabbix_api_user'];
+    }
+
+    if (isset($config['zabbix_api_pwd']))
+    {
         $z_api_pass = $config['zabbix_api_pwd'];
+    }
 
     // Mail sender
-    $mailFrom = array($config['mail_from']=>'Zabbix Mailgraph');
+    $mailFrom = $config['mail_from'];
 
     // Derived variables - do not change!
     $z_server = $p_URL;                             // Zabbix server URL from config
@@ -554,7 +661,7 @@
 
     $request = array('jsonrpc'=>'2.0',
                      'method'=>'user.login',
-                     'params'=>array('user'=>$z_api_user,
+                     'params'=>array('username'=>$z_api_user,
                                      'password'=>$z_api_pass),
                      'id'=>nextRequestID(),
                      'auth'=>null);
@@ -564,10 +671,58 @@
     $token = '';
     if (isset($result['result'])) { $token = $result['result']; }
 
-    if ($token=='') { echo 'Error logging in to Zabbix? ('.$z_url_api.')'; die; }
+    if ($token=='')
+    {
+        echo 'Error logging in to Zabbix? ('.$z_url_api.'): '.$cCRLF;
+        echo var_dump($request).$cCRLF;
+        echo var_dump($result).$cCRLF;
+        die;
+    }
 
     _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 ---
+    // -----------------------------------
+
+    if ($p_eventId=="0")
+    {
+        _log('# No event ID given, picking up random event from Zabbix');
+
+        $request = array('jsonrpc'=>'2.0',
+                         'method'=>'problem.get',
+                         'params'=>array('output'=>'extend',
+                                         'recent'=>'true',
+                                         'limit'=>1),
+                         'auth'=>$token,
+                         'id'=>nextRequestID());
+
+        $thisProblems = postJSON($z_url_api, $request);
+        _log('> Problem data'.$cCRLF.json_encode($thisProblems,JSON_PRETTY_PRINT|JSON_NUMERIC_CHECK));
+
+        if (!isset($thisProblems['result'][0])) { echo '! No response data received?'.$cCRLF; die; }
+
+        $p_eventId = $thisProblems['result'][0]['eventid'];
+        _log('> Picked up random last event #'.$p_eventId);
+    }
+
     // ------------------------------
     // --- READ EVENT INFORMATION ---
     // ------------------------------
@@ -621,10 +776,10 @@
                      'params'=>array('triggerids'=>$p_triggerId,
                                      'output'=>'extend',
                                      'selectFunctions'=>'extend',
-                                     'selectTags'=>'extend'),
+                                     'selectTags'=>'extend',
                                      'expandComment'=>1,
                                      'expandDescription'=>1,
-                     'expandExpression'=>1,
+                                     'expandExpression'=>1),
                      'auth'=>$token,
                      'id'=>nextRequestID());
 
@@ -710,6 +865,16 @@
         }
     }
 
+    if (!isset($p_itemId))
+    {
+        foreach($thisTrigger['result'][0]['functions'] as $aFunction)
+        {
+            $p_itemId = $aFunction['itemid'];
+            _log('- Item ID taken from trigger (first) function = '.$p_itemId);
+            break;
+        }
+    }
+
     // ---------------------
     // --- GET ITEM INFO ---
     // ---------------------
@@ -766,7 +931,7 @@
 
     $mailData['HOST_ID'] = $thisHost['result'][0]['hostid'];
     $mailData['HOST_NAME'] = $thisHost['result'][0]['name'];
-    $mailData['HOST_ERROR'] = $thisHost['result'][0]['error'];
+    if (isset($thisHost['result'][0]['error'])) { $mailData['HOST_ERROR'] = $thisHost['result'][0]['error']; }
     $mailData['HOST_DESCRIPTION'] = $thisHost['result'][0]['description'];
 
     // --- Custom settings?
@@ -1011,6 +1176,7 @@
         _log('> Graphs found = '.sizeof($triggerGraphs));
     }
 
+    $hostGraphs = array();
 
     if ($hostScreen>0)
     {
@@ -1062,7 +1228,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); }
@@ -1114,6 +1280,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];
         }
@@ -1144,6 +1311,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'];
@@ -1213,70 +1381,61 @@
     // 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));
+        $mail->SMTPDebug = 0;
 
+        $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 and recipient
+        $mail->setFrom($mailFrom, 'mailGraph');
+        $mail->addAddress($p_recipient);
+
+        // --- Prepare embedding of the graphs by attaching and generating "cid" (content-id) information
+        function embedGraphs($graphs,$varName,$type)
         {
-                $transport->setStreamOptions([
+            global $mail;
-                    'ssl' => ['allow_self_signed' => true,
+            global $mailData;
-                              'verify_peer' => false,
+
-                              'verify_peer_name' => false]
+            foreach($graphs as $aKey=>$anItem)
-                    ]);
-            }
-        }
-        else
             {
-            if ($transport instanceof \Swift_Transport_EsmtpTransport)
+                $mail->AddEmbeddedImage($mailData['GRAPHS_'.$varName][$aKey]['PATH'],
-            {
+                                        $mailData['GRAPHS_'.$varName][$aKey]['CID']);
-                $transport->setStreamOptions([
+
-                    'ssl' => ['allow_self_signed' => false,
+                // Add content-id marker to the identifier for ease of use in Twig
-                              'verify_peer' => true,
+                $mailData['GRAPHS_'.$varName][$aKey]['CID'] = 'cid:'.$mailData['GRAPHS_'.$varName][$aKey]['CID'];
-                              'verify_peer_name' => true]
+
-                ]);
+                _log('> Embedded graph image ('.$type.') '.$mailData['GRAPHS_'.$varName][$aKey]['URL']);
             }
         }
-    }
-    else
-    {
-        $transport = (new Swift_SmtpTransport($p_smtp_server, $p_smtp_port));
-    }
 
-    // Username/password?
+        embedGraphs($graphFiles,'I','ITEM');
-
+        embedGraphs($triggerGraphs,'T','TRIGGER');
-    if ($p_smtp_username!='') { $transport->setUsername($p_smtp_username); }
+        embedGraphs($hostGraphs,'H','HOST');
-    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');
 
+        // --- 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'),
@@ -1285,57 +1444,52 @@
 
         $twig = new \Twig\Environment($loader);
 
-    // --- Embed the images
-
-    function embedGraphs($graphs,$varName,$type)
-    {
-        global $message;
-        global $mailData;
-
-        foreach($graphs as $aKey=>$anItem)
-        {
-            $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']);
-        }
-    }
-
-    embedGraphs($graphFiles,'I','ITEM');
-    embedGraphs($triggerGraphs,'T','TRIGGER');
-    embedGraphs($hostGraphs,'H','HOST');
-
-    // --- Render the content
-
         $bodyHTML = $twig->render('html', $mailData);
         $bodyPlain = $twig->render('plain', $mailData);
         $mailSubject = $twig->render('subject', $mailData);
 
-    // Prepare message
+        // --- Attach debug log processing?
-
-    $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');
+            $mail->addStringAttachment($mailData['LOG_HTML'],'log.html');
-        $message->attach($attachLogHTML);
+            $mail->addStringAttachment($mailData['LOG_PLAIN'],'log.txt');
-
-        $attachLogPlain = new Swift_Attachment($mailData['LOG_PLAIN'], 'log.txt', '/text/plain');
-        $message->attach($attachLogPlain);
         }
 
-    // Send message
+        // ---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;
 
-    $result = $mailer->send($message);
+        // --- Send the message
+        if (!$mail->send())
+        {
+            _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;
+        }
 
-    // Return Event TAG information for Zabbix
+        // --- Obtain message ID
+        $messageId = $mail->getlastMessageID();
+        _log('# Message ID = '.$messageId);
 
-    $response = array('messageId.mailGraph'=>$messageId);
+        // --- 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());
+    }
 
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     // Wrap up //////////////////////////////////////////////////////////////////////////////////////////////
@@ -1345,14 +1499,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,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>5.0</version>
+    <version>5.4</version>
-    <date>2021-03-17T12:55:43Z</date>
+    <date>2023-07-02T12:48:36Z</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.example.com/</value>
                 </parameter>
                 <parameter>
                     <name>duration</name>
@@ -61,127 +61,152 @@
                 </parameter>
                 <parameter>
                     <name>URL</name>
-                    <value>https://mydomain.com/mailGraph.php</value>
+                    <value>https://myzabbix.example.com/mailGraph.php</value>
                 </parameter>
             </parameters>
-            <script>try {&#13;
+            <script>// mailGraph v2.12
-    // Pickup parameters&#13;
+try {
-    params = JSON.parse(value),&#13;
+    // Pickup parameters
-        req = new CurlHttpRequest(),&#13;
+    params = JSON.parse(value),
-        fields = {},&#13;
+        req = new HttpRequest(),
-        resp = '',&#13;
+        fields = {},
-        result = { tags: {} };&#13;
+        resp = '',
-&#13;
+        result = { tags: {} };
-    // Set HTTP proxy if required&#13;
+
-    if (typeof params.HTTPProxy === 'string' &amp;&amp; params.HTTPProxy.trim() !== '') {&#13;
+    // Set HTTP proxy if required
-        req.setProxy(params.HTTPProxy);&#13;
+    if (typeof params.HTTPProxy === 'string' &amp;&amp; params.HTTPProxy.trim() !== '') {
-        fields.HTTPProxy = params.HTTPProxy;&#13;
+        req.setProxy(params.HTTPProxy);
-    }&#13;
+        fields.HTTPProxy = params.HTTPProxy;
-&#13;
+    }
-    // Declare output type&#13;
+
-    req.AddHeader('Content-Type: application/json');&#13;
+    // Declare output type
-&#13;
+    req.addHeader('Content-Type: application/json');
-    // Must have fields&#13;
+
-    fields.itemId = params.itemId;&#13;
+    // Must have fields
-    fields.eventId = params.eventId;&#13;
+    fields.itemId = params.itemId * 1;
-    fields.recipient = params.recipient;&#13;
+    fields.eventId = params.eventId * 1;
-    fields.baseURL = params.baseURL;&#13;
+    fields.recipient = params.recipient;
-    fields.duration = params.duration;&#13;
+    fields.baseURL = params.baseURL;
-&#13;
+    fields.duration = params.duration * 1;
-    // Optional fields&#13;
+
-    if (typeof params.graphWidth === 'string') { fields.graphWidth = params.graphWidth; }&#13;
+    if (isNaN(fields.eventId)) {
-    if (typeof params.graphHeight === 'string') { fields.graphHeight = params.graphHeight; }&#13;
+      throw '[MailGraph Webhook] Invalid event ID? Integer required (use actual event ID from Zabbix!)';
-    if (typeof params.subject === 'string') { fields.subject = params.subject; }&#13;
+    }
-    if (typeof params.showLegend === 'string') { fields.showLegend = params.showLegend; }&#13;
+
-    if (typeof params.periods === 'string') { fields.periods = params.periods; }&#13;
+    if (isNaN(fields.duration)) {
-    if (typeof params.periods_headers === 'string') { fields.periods_headers = params.periods_headers; }&#13;
+      throw '[MailGraph Webhook] Invalid duration? Integer required (set to zero if unknown)!';
-    if (typeof params.debug === 'string') { fields.debug = params.debug; }&#13;
+    }
-&#13;
+
-    // Add generic fields&#13;
+    if (fields.recipient.charAt(0) == '{') {
-    Object.keys(params).forEach(function(key) {&#13;
+      throw '[MailGraph Webhook] Please define recipient for the test message!';
-        if (key.substring(0, 4) == 'info') {&#13;
+    }
-            fields[key] = params[key];&#13;
+
-        }&#13;
+    // Optional fields
-    });&#13;
+    if (typeof params.graphWidth === 'string') { fields.graphWidth = params.graphWidth; }
-&#13;
+    if (typeof params.graphHeight === 'string') { fields.graphHeight = params.graphHeight; }
-    // Post information to the processing script&#13;
+    if (typeof params.subject === 'string') { fields.subject = params.subject; }
-    Zabbix.Log(4, '[MailGraph Webhook] Sending request: ' + params.URL + '?' + JSON.stringify(fields));&#13;
+    if (typeof params.showLegend === 'string') { fields.showLegend = params.showLegend; }
-    var resp = req.Post(params.URL,JSON.stringify(fields));&#13;
+    if (typeof params.periods === 'string') { fields.periods = params.periods; }
-    Zabbix.Log(4, '[Mailgraph Webhook] Receiving response:' + resp);&#13;
+    if (typeof params.periods_headers === 'string') { fields.periods_headers = params.periods_headers; }
-&#13;
+    if (typeof params.debug === 'string') { fields.debug = params.debug; }
-    // If there was an error, report it&#13;
+
-    if (req.Status() != 200) { throw JSON.parse(resp).errors[0]; }&#13;
+    // Add generic fields
-&#13;
+    Object.keys(params).forEach(function(key) {
-    // We expect the message id back from the processing script&#13;
+        if (key.substring(0, 4) == 'info') {
-    resp = JSON.parse(resp);&#13;
+            fields[key] = params[key];
-    result.tags.__message_id = resp.messageId;&#13;
+        }
-&#13;
+    });
-    // Pass the result back to Zabbix&#13;
+
-    return JSON.stringify(result);&#13;
+    // Post information to the processing script
-}&#13;
+    Zabbix.Log(4, '[MailGraph Webhook] Sending request: ' + params.URL + '?' + JSON.stringify(fields));
-catch (error)&#13;
+    var resp = req.post(params.URL,JSON.stringify(fields));
-{&#13;
+    Zabbix.Log(4, '[Mailgraph Webhook] Received response:' + resp);
-    // In case something went wrong in the processing, pass the error back to Zabbix&#13;
+
-    Zabbix.Log(127, 'MailGraph notification failed : '+error);&#13;
+    // If blank the email address is likely incorrect
-    throw 'MailGraph notification failed : '+error;&#13;
+    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) == &quot;!&quot;) {
+      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 &quot;' + msg.messageId + '&quot;');
+
+    // 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;
 }</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
-- &quot;periods&quot; and &quot;periods_headers&quot; can be defined for displaying multiple periods of the same graph, or&#13;
+- &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&#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).&#13;
+The html.template and plain.template files can be adjusted (TWIG format).
-&#13;
+
 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.URL}
-&#13;
+
-eventId: {EVENT.ID}&#13;
+eventId: {EVENT.ID}
-TriggerId: {TRIGGER.ID}&#13;
+TriggerId: {TRIGGER.ID}
 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.URL}
-&#13;
+
-eventId: {EVENT.ID}&#13;
+eventId: {EVENT.ID}
-TriggerId: {TRIGGER.ID}&#13;
+TriggerId: {TRIGGER.ID}
 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;
+eventId: {EVENT.ID}
-TriggerId: {TRIGGER.ID}&#13;
+TriggerId: {TRIGGER.ID}
 itemId: {ITEM.ID]</message>
                 </message_template>
             </message_templates>