v2.15 - Fixed issues found in Zabbix 5.4.12 and refactored Javascript for better error handling

itemId no longer required/possibel per Zabbix 6.2. T
new items for SMTP from
keeping "mail_from" for backwards compatibility.

CODE_OF_CONDUCT.md

@@ -0,0 +1,49 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at abuse@puzzl.nl. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see https://www.contributor-covenant.org/faq

README.md

@@ -1,146 +1,129 @@
-# mailGraph
+## 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.
 
-# WORK IN PROGRESS
+This initiated the development of mailGraph v1 in Zabbix 5.4 delivering an elementary solution for sending HTML enriched messages from Zabbix including graphs.
-Getting the code ready for further distribution.
+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.
 
-# Installation pre-requisites
+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}`.
-The suggested installation path of this script is on the same host where Zabbix lives but outside the actual Zabbix directory, although it is possible to run the script entirely somewhere else (the code is webhook based, picking up information from Zabbix is via the front-end login and API).
 
-# I'm assuming
+Note that all Zabbix host, item or screen related information is made available to Twig automatically.
-- you are familiar with "composer"
-- you know how to configure a webserver/virtual host
-- that you have CURL and PHP installed
 
-# Prepare the installation
+Example message:
-- Pick a directory within a (virtual) host of your webserver
-- Create the directories "config", "images", "log", "templates" and "tmp" inside this directory
-- Copy .htaccess to the main directory _(if not using Apache make sure your webserver denies access to /config!)_
-- Copy mailGraph.php to the main directory
-- Install SwiftMailer: "composer require swiftmailer/swiftmailer"
-- Install TWIG: "composer require twig/twig"
-- Copy config/config.php to your /config directory
-- Copy config/config.json.template to your /config/ directory and rename to "config.json"
-- Copy templates/html.template and templates/plain.template to your templates directory
-- Copy mailGraph.xml to a location where you can upload the Media Type to Zabbix
 
-# Configuration
+[![](images/Example-mail-message-v122.png?raw=true)](images/Example-mail-message-v122.png)
-- Goto your /config directory
-- Two ways to configure the config.json file: 1) with config.php or 2) with your favorite text editor (note that you must have knowledge of JSON format to use this option)'
-- List the available configuration options with "php config.php config.json list"
-- Change any option with "php config.php config.json replace 'key_name' 'new_value'" (note the usage of the single quotes from the command-line!)
 
-**"script_baseurl"** should point to the URL of your directory (ie. "https://mydomain.com/mailgraph/"). Note the ending '/'!
+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).
 
-**"zabbix_user"** must be a Zabbix SuperAdmin user you create to login to Zabbix (this is for grabbing the images via the regular Zabbix routines).
+More information can be found in the Wiki.
 
-**"zabbix_user_api"** must also be a Zabbix SuperAdmin user your create to login to the Zabbix API (this is for grabbing the information of the event via the Zabbix API).
+## Installation ##
+Please refer to the Wiki how to get mailGraph installed and configured on your system.
 
-**"mail_from"** must be a valid e-mail address which represents the 'from' address in the mails that are sent (ie. "zabbix.mailgraph.noreply@domain.com").
+## mailGraph v2.15 release ##
+_(2023/08/16)_
 
-# Load the Media Type "MailGraph" into Zabbix
+_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)_
-- Login to your Zabbix instance
-- Goto "Administration" => "Media yypes"
-- Import the "mailGraph.xml" file
-- Edit the new media type
-- Configure some of the macros associated
 
-"baseURL" must contain your Zabbix URL (ie. "https://mydomain.com/zabbix/"). Note the ending '/'!
+Release notes
+- Fixed new error condition found in Zabbix 5.4.12 where zeroed or blank parameters for a webhook are no longer added as parameters in the Javascript.
+- Refactored error handling inside the Javascript to distinguish automatically between 'email ID response' or a debug or warning level message (this prevents the code of throwing an unknown error like 'Invalid JSON').
 
-You can set your custom "graphWidth" and "GraphHeight" to your convenience.
+## mailGraph v2.14 release ##
+_(2023/07/10)_
 
-You can switch the graph legend on/off with "showLegend" (0=off,1=on).
+_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)_
 
-You can change the "subject" of the e-mail that is sent (note that the markup can be a combination of Zabbix MACRO or TWIG notation!).
+Release notes
+- Adding the ability to define FROM details for the emails generated by mailGraph
+  - `smtp_from_address` to set the from mail address (if not set uses mailing system default). Note: obsolete `mail_from` but retained for backwards compatibility.
+  - `smtp_from_name` to set the name that goes with the mail address (if not set uses "mailGraph").
+- Adding the ability to define REPLY_TO details for the emails generated by mailGraph
+  - `smtp_reply_address` to set the reply-to mail address (if not set, no reply-to will be added to the message).
+  - `smtp_reply_name` to set the reply-to name of the mailbox (if not set defaults to "mailGraph feedback").
+- Adding a new URL for use in the template:
+  - `ACK_URL` points to the function in Zabbix for editing and submitting an Acknowledge statement.
 
-"URL" is the url to the mailGraph script (ie. "https://mydomain.com/mailGraph.php").
+## mailGraph v2.13 release ##
+_(2023/07/03)_
 
-# Actions configuration
+_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)_
-At this point the Media type is ready for configuration under "actions" as per the regular way of Zabbix alert processing. Please refer to the manual how to configure.
 
-# Template adjustments
+Release notes
-I've picked TWIG as the template processor, where the following macros are available for your convenience. Feel free to adjust the html.template and plain.template files as you see fit for your situation!
+- Fixed references into Zabbix
+  - Trigger was missing "context" parameter
+  - Item was missing "context" parameter
+  - Problems reference to this host was not generated at all
 
-Values available:
+## mailGraph v2.12 release ##
+_(2023/07/02)_
 
-{{ baseURL }} - base url of the Zabbix system (use for references to API and login)
+_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)_
 
-{{ TRIGGER_ID }} - id of the applicable trigger
+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
 
-{{ TRIGGER_DESCRIPTION }} - raw trigger description (note: macros are not parsed!)
+**Please consider to move to PHPMailer as soon as possible as Swiftmailer is abandoned. Installation instructions are included on the wiki.**
 
-{{ TRIGGER_COMMENTS }} - comments of the trigger
+Principal approach: `composer require phpmailer/phpmailer`, install mailGraph v2.12 or higher.
 
-{{ TRIGGER_URL }} - url of the trigger form
+In case Swiftmailer is no longer used elsewhere you can consider to remove this package with `swiftmailer/swiftmailer`.
 
-{{ ITEM_ID }} - id of the associated item to the trigger
+## mailGraph v2.11 release ##
+_(2023/07/01)_
 
-{{ ITEM_KEY }} - key of the item
+_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)_
 
-{{ ITEM_NAME }} - item name
+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)
 
-{{ ITEM_DESCRIPTION }} - description of the item
+Modified files
+- mailGraph.php
+- mailGraph.xml
+- javascript/zabbix.mailGraph.js
 
-{{ ITEM_LASTVALUE }} - last value of the item
+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
 
-{{ ITEM_PREVIOUSVALUE }} - the value of the before LASTVALUE
+Changes are in effect immediately, no need to restart any services.
 
-{{ ITEM_URL }} - url of the item form
+## mailGraph v2.10 release ##
+_(2023/06/30)_
 
-{{ HOST_ID }} - id of the associated host to the item
+_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._
 
-{{ HOST_NAME }} - name of the host
+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
 
-{{ HOST_ERROR }} - last error state of the applicable host
+## Zabbix 6.4.x testing ##
+_(2023/06/30)_
 
-{{ HOST_DESCRIPTION }} - description of the host
+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")
 
-{{ HOST_URL }} - url of the host form
+Sidenotes
+- Zabbix logging still shows deprecation messages however it is believed these are internal to Zabbix and not related to mailGraph
 
-{{ EVENT_ID }} - id of the associated event
+_(2023/06/29)_
 
-{{ EVENT_NAME }} - name of the event (note: macros are parsed!)
+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.
 
-{{ EVENT_OPDATA }} - associated operational data of the vent
+## 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)
 
-{{ EVENT_VALUE }} - event state (0=Recovered, 1=Triggered/Active)
+## 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.
 
-{{ EVENT_SEVERITY }} - severity of the event
+**v1.x is no longer supported; please upgrade to the current v2 release**
-
-{{ EVENT_STATUS }} - status of the event
-
-{{ EVENT_URL }} - url of the event details
-
-{{ GRAPH_ID }} - id of the (first) associated graph that contains the item
-
-{{ GRAPH_NAME }} - name of this graph
-
-{{ GRAPH_URL }} - URL to this graph (assuming script produces to an accessible location)
-
-{{ GRAPH_CID }} - IMG embed string (<img src="{{ GRAPH_CID }}" />)
-
-{{ LOG_HTML }} - script log in HTML format
-
-{{ LOG_PLAIN }} - script log in PLAIN text format
-
-# Troubleshooting
-In general if something goes wrong (no output), use the following sequence to identify where the error has occured (and raise an issue in this repository so I can take a look at it):
-- Goto Zabbix => Reports => Action Log and search for events with Status "Failed"
-- Note the itemId, triggerId and eventId from this event for testing the Media Type manually
-- If the popup message says "Syntax Error" something went wrong with the processing during the script. In this case you have to investigate a bit more what is happening.
-
-The easiest way to test what is happening is to now goto Administration => Media types and hit the "Test" at the right hand side for MailGraph.
-- Replace relevant macros with information (eventId, triggerId, itemId, recipient, baseUrl and URL) and hit "Test"
-- The last line in the result will tell you what the problem is (most likely an access or connectivity issue)
-- Fix accordingly and retry
-
-To facilitate troubleshooting, you can (at code level):
-- switch on $cDebugMail to receive processing logs as attachment of an e-mail message
-- store logs in the /log directory when $cDebug is switched on
-
-In case of an issue that happens before an e-mail is sent, you can also perform a CLI based test:
-- php mailGraph.php test
-
-Note that you have to set the configuration items starting with "cli" in config.json with actual values from a previous message to make this work!
-
-Last resort is to raise an issue in this repository and I will try to assist as soon as possible to fix it.

config/config.json.template

@@ -1,15 +1,31 @@
 {
-    "script_baseurl": "https:\/\/domain.com\/",
+    "script_baseurl": "https:\/\/mydomain.com\/",
-    "cli_itemId": 0,
-    "cli_triggerId": 0,
     "cli_eventId": 0,
-    "cli_eventValue": 0,
     "cli_duration": 0,
-    "cli_recipient": "recipient@domain.com",
+    "cli_recipient": "recipient@mydomain.com",
-    "cli_baseURL": "https:\/\/domain.com\/zabbix\/",
+    "cli_subject": "[TEST] {{ HOST_NAME|raw }}:  ({{ EVENT_SEVERITY }}) {{ EVENT_NAME|raw }}",
+    "cli_baseURL": "https:\/\/mydomain.com\/zabbix\/",
+    "cli_period": "30m",
+    "cli_period_header": "Last 30 minutes",
+    "cli_debug": 1,
+    "cli_proxy": "",
     "zabbix_user": "alogicalusername",
-    "zabbix_pwd": "astrongpassword",
+    "zabbix_user_pwd": "astrongpassword",
     "zabbix_api_user": "alogicalusername",
     "zabbix_api_pwd": "astrongpassword",
-    "mail_from": "sender@domain.com"
+    "subject": "{{ HOST_NAME|raw }}:  ({{ EVENT_SEVERITY }}) {{ EVENT_NAME|raw }}",
+    "smtp_server": "localhost",
+    "smtp_port": 25,
+    "smtp_transport": "none",
+    "smtp_from_address": "mailgraph@mydomain.com",
+    "smtp_from_name": "mailGraph",
+    "smtp_reply_address": "feedback@mydomain.com",
+    "smtp_from_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

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

config/config.php

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

javascript/READ.ME

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

javascript/zabbix.mailGraph.js

@@ -0,0 +1,99 @@
+// mailGraph v2.15
+
+// 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' && 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 "' + msg.messageId + '"');
+
+    // 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;
+}

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-02-27T16:34:16Z</date>
+    <date>2023-08-16T12:05:37Z</date>
     <media_types>
         <media_type>
             <name>MailGraph</name>
@@ -9,7 +9,7 @@
             <parameters>
                 <parameter>
                     <name>baseURL</name>
-                    <value>https://zbx.puzzl.nl/zabbix/</value>
+                    <value>https://myzabbix.com/zabbix/</value>
                 </parameter>
                 <parameter>
                     <name>duration</name>
@@ -19,10 +19,6 @@
                     <name>eventId</name>
                     <value>{EVENT.ID}</value>
                 </parameter>
-                <parameter>
-                    <name>eventValue</name>
-                    <value>{EVENT.VALUE}</value>
-                </parameter>
                 <parameter>
                     <name>graphHeight</name>
                     <value>120</value>
@@ -36,8 +32,16 @@
                     <value/>
                 </parameter>
                 <parameter>
-                    <name>itemId</name>
+                    <name>infoTest</name>
-                    <value>{ITEM.ID}</value>
+                    <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>
@@ -49,153 +53,161 @@
                 </parameter>
                 <parameter>
                     <name>subject</name>
-                    <value>{{ EVENT_SEVERITY }} --- {{ EVENT_NAME }}</value>
+                    <value>{{ HOST_NAME|raw }}: ({{ EVENT_SEVERITY }}) {{ EVENT_NAME|raw }}</value>
-                </parameter>
-                <parameter>
-                    <name>triggerId</name>
-                    <value>{TRIGGER.ID}</value>
                 </parameter>
                 <parameter>
                     <name>URL</name>
-                    <value>https://zbx.puzzl.nl/mailGraph.php</value>
+                    <value>https://myzabbix.com/mailGraph.php</value>
                 </parameter>
             </parameters>
-            <script>try {&#13;
+            <script>// mailGraph v2.15
-  // Pickup parameters&#13;
+
-  params = JSON.parse(value),&#13;
+// Function to test string
-           req = new CurlHttpRequest(),&#13;
+function isJSON(str) {
-           fields = {},&#13;
+	try {
-           resp = '',&#13;
+		JSON.stringify(JSON.parse(str));
-           result = { tags: {} };&#13;
+		return true;
-&#13;
+	} catch (e) {
-  // Set HTTP proxy if required&#13;
+		return false;
-  if (typeof params.HTTPProxy === 'string' &amp;&amp; params.HTTPProxy.trim() !== '') { req.setProxy(params.HTTPProxy); }&#13;
+	}
-&#13;
+}
-  // Declare output type&#13;
+
-  req.AddHeader('Content-Type: application/json');&#13;
+try {
-&#13;
+    // Pickup parameters
-  // Must have fields&#13;
+    params = JSON.parse(value),
-  fields.itemId = params.itemId;&#13;
+        req = new HttpRequest(),
-  fields.triggerId = params.triggerId;&#13;
+        fields = {},
-  fields.eventId = params.eventId;&#13;
+        resp = '',
-  fields.eventValue = params.eventValue;&#13;
+        result = { tags: {} };
-  fields.recipient = params.recipient;&#13;
+
-  fields.baseURL = params.baseURL;&#13;
+    // Set HTTP proxy if required
-  fields.duration = params.duration;&#13;
+    if (typeof params.HTTPProxy === 'string' &amp;&amp; params.HTTPProxy.trim() !== '') {
-&#13;
+        req.setProxy(params.HTTPProxy);
-  // Optional fields&#13;
+        fields.HTTPProxy = params.HTTPProxy;
-  if (typeof params.graphWidth === 'string') { fields.graphWidth = params.graphWidth; }&#13;
+    }
-  if (typeof params.graphHeight === 'string') { fields.graphHeight = params.graphHeight; }&#13;
+
-  if (typeof params.subject === 'string') { fields.subject = params.subject; }&#13;
+    // Declare output type
-  if (typeof params.showLegend === 'string') { fields.showLegend = params.showLegend; }&#13;
+    req.addHeader('Content-Type: application/json');
-&#13;
+
-  // Post information to the processing script&#13;
+    // Pick up fields relevant for mailGraph API level call while parsing/casting fields that should be integer
-  Zabbix.Log(4, '[MailGraph Webhook] Sending request: ' + params.URL + '?' + JSON.stringify(fields));&#13;
+    fields.itemId = params.itemId * 1;
-  var resp = req.Post(params.URL,JSON.stringify(fields));&#13;
+    fields.eventId = params.eventId * 1;
-  Zabbix.Log(4, '[Mailgraph Webhook] Receiving response:' + resp);&#13;
+    fields.recipient = params.recipient;
-&#13;
+    fields.baseURL = params.baseURL;
-  // If there was an error, report it&#13;
+    fields.duration = params.duration * 1;
-  if (req.Status() != 200) { throw JSON.parse(resp).errors[0]; }&#13;
+
-&#13;
+    if (fields.recipient.charAt(0) == '{') {
-  // We expect the message id back from the processing script&#13;
+      throw '[MailGraph Webhook] Please define recipient for the test message!';
-  resp = JSON.parse(resp);&#13;
+    }
-  result.tags.__message_id = resp.messageId;&#13;
+
-&#13;
+    // Optional fields
-  // Pass the result back to Zabbix&#13;
+    if (typeof params.graphWidth === 'string') { fields.graphWidth = params.graphWidth; }
-  return JSON.stringify(result);&#13;
+    if (typeof params.graphHeight === 'string') { fields.graphHeight = params.graphHeight; }
-}&#13;
+    if (typeof params.subject === 'string') { fields.subject = params.subject; }
-catch (error)&#13;
+    if (typeof params.showLegend === 'string') { fields.showLegend = params.showLegend; }
-{&#13;
+    if (typeof params.periods === 'string') { fields.periods = params.periods; }
-  // In case something went wrong in the processing, pass the error back to Zabbix&#13;
+    if (typeof params.periods_headers === 'string') { fields.periods_headers = params.periods_headers; }
-  Zabbix.Log(127, 'MailGraph notification failed : '+error);&#13;
+    if (typeof params.debug === 'string') { fields.debug = params.debug; }
-  throw 'MailGraph notification failed : '+error;&#13;
+
+    // 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.&#13;
+            <description>The &quot;URL&quot; must point to the location of the processing script. If a proxy is required, define &quot;HTTPProxy&quot; for the proxy address.
-&#13;
+
-Customization:&#13;
+Customization:
-- &quot;graphWidth&quot; and &quot;graphWidth&quot; can be defined for the image size&#13;
+- &quot;graphWidth&quot; and &quot;graphWidth&quot; can be defined for the image size
-- &quot;showLegend&quot; can be defined to show or hide the legend of the graph&#13;
+- &quot;showLegend&quot; can be defined to show or hide the legend of the graph
-- &quot;subject&quot; can be defined for a customized subject for the mail message&#13;
+- &quot;subject&quot; can be defined for a customized subject for the mail message
-&#13;
+- &quot;periods&quot; and &quot;periods_headers&quot; can be defined for displaying multiple periods of the same graph, or
-The html.template and plain.template files can be adjusted (TWIG format).&#13;
+- &quot;period&quot; and &quot;period_header&quot; can be defined to display a single graph
-&#13;
+
-Values available:&#13;
+The html.template and plain.template files can be adjusted (TWIG format).
-{{ baseURL }} - base url of the Zabbix system (use for references to API and login)&#13;
+
-{{ TRIGGER_ID }} - id of the applicable trigger&#13;
+More details are available at https://github.com/moudsen/mailGraph</description>
-{{ TRIGGER_DESCRIPTION }} - raw trigger description (note: macros are not parsed!)&#13;
-{{ TRIGGER_COMMENTS }} - comments of the trigger&#13;
-{{ TRIGGER_URL }} - url of the trigger form&#13;
-{{ ITEM_ID }} - id of the associated item to the trigger&#13;
-{{ ITEM_KEY }} - key of the item&#13;
-{{ ITEM_NAME }} - item name&#13;
-{{ ITEM_DESCRIPTION }} - description of the item&#13;
-{{ ITEM_LASTVALUE }} - last value of the item&#13;
-{{ ITEM_PREVIOUSVALUE }} - the value of the before LASTVALUE&#13;
-{{ ITEM_URL }} - url of the item form&#13;
-{{ HOST_ID }} - id of the associated host to the item&#13;
-{{ HOST_NAME }} - name of the host&#13;
-{{ HOST_ERROR }} - last error state of the applicable host&#13;
-{{ HOST_DESCRIPTION }} - description of the host&#13;
-{{ HOST_URL }} - url of the host form&#13;
-{{ EVENT_ID }} - id of the associated event&#13;
-{{ EVENT_NAME }} - name of the event (note: macros are parsed!)&#13;
-{{ EVENT_OPDATA }} - associated operational data of the vent&#13;
-{{ EVENT_VALUE }} - event state (0=Recovered, 1=Triggered/Active)&#13;
-{{ EVENT_SEVERITY }} - severity of the event&#13;
-{{ EVENT_STATUS }} - status of the event&#13;
-{{ EVENT_URL }} - url of the event details&#13;
-{{ GRAPH_ID }} - id of the (first) associated graph that contains the item&#13;
-{{ GRAPH_NAME }} - name of this graph&#13;
-{{ GRAPH_URL }} - URL to this graph (assuming script produces to an accessible location)&#13;
-{{ GRAPH_CID }} - IMG embed string (&lt;img src=&quot;{{ GRAPH_CID }}&quot; /&gt;)&#13;
-{{ LOG_HTML }} - script log in HTML format&#13;
-{{ LOG_PLAIN }} - script log in PLAIN text format</description>
             <message_templates>
                 <message_template>
                     <event_source>TRIGGERS</event_source>
                     <operation_mode>PROBLEM</operation_mode>
                     <subject>Problem: {EVENT.NAME}</subject>
-                    <message>Problem started at {EVENT.TIME} on {EVENT.DATE}&#13;
+                    <message>Problem started at {EVENT.TIME} on {EVENT.DATE}
-Problem name: {EVENT.NAME}&#13;
+Problem name: {EVENT.NAME}
-Host: {HOST.NAME}&#13;
+Host: {HOST.NAME}
-Severity: {EVENT.SEVERITY}&#13;
+Severity: {EVENT.SEVERITY}
-Operational data: {EVENT.OPDATA}&#13;
+Operational data: {EVENT.OPDATA}
-Original problem ID: {EVENT.ID}&#13;
+Original problem ID: {EVENT.ID}
-{TRIGGER.URL}&#13;
+Trigger ID (/url): {TRIGGER.ID} {TRIGGER.URL}</message>
-&#13;
-eventId: {EVENT.ID}&#13;
-TriggerId: {TRIGGER.ID}&#13;
-itemId: {ITEM.ID]</message>
                 </message_template>
                 <message_template>
                     <event_source>TRIGGERS</event_source>
                     <operation_mode>RECOVERY</operation_mode>
-                    <subject>Resolved in {EVENT.DURATION}: {EVENT.NAME}</subject>
+                    <subject>Resolved in {EVENT.DURATION}: {EVENT.RECOVERY.NAME}</subject>
-                    <message>Problem has been resolved at {EVENT.RECOVERY.TIME} on {EVENT.RECOVERY.DATE}&#13;
+                    <message>Problem has been resolved at {EVENT.RECOVERY.TIME} on {EVENT.RECOVERY.DATE}
-Problem name: {EVENT.NAME}&#13;
+Problem name: {EVENT.RECOVERY.NAME}
-Problem duration: {EVENT.DURATION}&#13;
+Problem duration: {EVENT.DURATION}
-Host: {HOST.NAME}&#13;
+Host: {HOST.NAME}
-Severity: {EVENT.SEVERITY}&#13;
+Severity: {EVENT.SEVERITY}
-Original problem ID: {EVENT.ID}&#13;
+Original problem ID: {EVENT.ID}
-{TRIGGER.URL}&#13;
+Trigger ID: {TRIGGER.ID} {TRIGGER.URL}</message>
-&#13;
-eventId: {EVENT.ID}&#13;
-TriggerId: {TRIGGER.ID}&#13;
-itemId: {ITEM.ID]</message>
                 </message_template>
                 <message_template>
                     <event_source>TRIGGERS</event_source>
                     <operation_mode>UPDATE</operation_mode>
                     <subject>Updated problem in {EVENT.AGE}: {EVENT.NAME}</subject>
-                    <message>{USER.FULLNAME} {EVENT.UPDATE.ACTION} problem at {EVENT.UPDATE.DATE} {EVENT.UPDATE.TIME}.&#13;
+                    <message>{USER.FULLNAME} {EVENT.UPDATE.ACTION} problem at {EVENT.UPDATE.DATE} {EVENT.UPDATE.TIME}.
-{EVENT.UPDATE.MESSAGE}&#13;
+{EVENT.UPDATE.MESSAGE}
-&#13;
+
-Current problem status is {EVENT.STATUS}, age is {EVENT.AGE}, acknowledged: {EVENT.ACK.STATUS}.&#13;
+Current problem status is {EVENT.STATUS}, age is {EVENT.AGE}, acknowledged: {EVENT.ACK.STATUS}.
-&#13;
+
-eventId: {EVENT.ID}&#13;
+Event ID: {EVENT.ID}
-TriggerId: {TRIGGER.ID}&#13;
+Trigger ID: {TRIGGER.ID}</message>
-itemId: {ITEM.ID]</message>
                 </message_template>
             </message_templates>
         </media_type>

templates/html.template

@@ -1,74 +1,193 @@
 <html lang="en"><head><meta http-equiv=Content-Type content="text/html; charset=UTF-8">
 <style>
-	.Resolved {
+    body {
-    background-color:#86cc89;
+        font-family: Arial,sans-serif;
-    border:1px solid #57bd5b;
+    }
-	font-family:Tahoma,Geneva,Arial,sans-serif;font-size:14px;
+    .Resolved {
-	}
+        background-color:#86cc89;
-	.Information {
+        border:1px solid #57bd5b;
-    background-color:#7499ff;
+    }
-    border:1px solid #4673f0;
+    .Information {
-	font-family:Tahoma,Geneva,Arial,sans-serif;font-size:14px;
+        background-color:#7499ff;
-	}
+        border:1px solid #4673f0;
-	.Warning {
+    }
-    background-color:#FFC859;
+    .Warning {
-    border:1px solid #E69F10;
+        background-color:#FFC859;
-	font-family:Tahoma,Geneva,Arial,sans-serif;font-size:14px;
+        border:1px solid #E69F10;
-	}
+    }
-	.Average {
+    .Average {
-    background-color:#FFA059;
+        background-color:#FFA059;
-    border:1px solid #e66e15;
+        border:1px solid #e66e15;
-	font-family:Tahoma,Geneva,Arial,sans-serif;font-size:14px;
+    }
-	}
+    .High {
-	.High {
+        background-color:#E97659;
-    background-color:#E97659;
+        border:1px solid #E45959;
-    border:1px solid #E45959;
+    }
-	font-family:Tahoma,Geneva,Arial,sans-serif;font-size:14px;
+    .Disaster {
-	}
+        background-color:#E45959;
-	.Disaster {
+        border:1px solid #DE1E09;
-    background-color:#E45959;
+    }
-    border:1px solid #DE1E09;
+    a {
-	font-family:Tahoma,Geneva,Arial,sans-serif;font-size:14px;
+        text-decoration: none;
-	}
+        color: #010059;
+    }
+    a:link {
+        text-decoration: none;
+        color: #010059;
+    }
+    a:visited {
+        text-decoration: none;
+        color: #010059;
+    }
+    a:active {
+        text-decoration: none;
+        color: #010059;
+    }
+    hr {
+        border: none;
+        height: 1px;
+        color: #333; /* old IE */
+        background-color: #333;
+    }
+    .MsgBody {
+        width: 100%;
+    }
+    #maintable {
+        width: 800px;
+    }
+    @media screen and (max-width: 800px;) {
+        #maintable {
+            width: 100%;
+            max-width: 790px;
+        }
+        #mainimage {
+            -ms-interpolation-mode: bicubic;
+            width: 100%;
+            max-width: 790px;
+            max-height: 450px;
+        }
+    }
+    .links {
+        font-size: 9px;
+    }
+    .header {
+        font-size: 16px;
+        font-weight: bold;
+    }
+    .graphHeader {
+        font-size: 14px;
+        font-weight: bold;
+    }
+    .content {
+        font-size: 14px;
+    }
 </style>
 </head>
 <body>
-<table style="margin: 10px;border-spacing:0 15px;border-collapse: separate;">
+    <table style="margin: 5px;border-spacing:0 10px;border-collapse: separate;" align=center>
-	<tr>
+        <tr>
-		<td class="{{ EVENT_SEVERITY }}" style="border-radius:10px;padding: 10px 36px 10px 36px; ">
+            <td class="{{ EVENT_SEVERITY }}" style="border-radius:10px;padding:5px 18px 5px 18px; ">
-			<table class="{{ EVENT_SEVERITY }}" style="border:0; text-align:left;" cellpadding="0" cellspacing="0">
+                <table class="{{ EVENT_SEVERITY }}" style="border:0; text-align:left;" cellpadding="0" cellspacing="0">
-                <tr><td>
+                    <tr>
-				<p><b>EVENT INFORMATION</b></p>
+                        <td>
-                    Description: <b>{{ EVENT_NAME }}</b><br/>
+                            <p><span class="header">EVENT INFORMATION</span></p>
-                    Host: <b>{{ HOST_NAME }}</b>
+                            <span class="content">
+                                Description: <b>{{ EVENT_NAME }}</b><br/>
+                                Host: <b>{{ HOST_NAME }}</b>
 {% if HOST_ERROR|length > 0 %}
- ({{ HOST_ERROR }})
+                                ({{ HOST_ERROR }})
 {% endif %}
-                    <br/>
+                                <br/>
-                    Operational data: <b>{{ EVENT_OPDATA }}</b><br/>
+{% if EVENT_OPDATE|length > 0 %}
-                    Status: <b>{{ EVENT_STATUS }}</b><br/>
+                                Operational data: <b>{{ EVENT_OPDATA }}</b><br/>
-                    Severity: <b>{{ EVENT_SEVERITY }}</b><br/>
+{% endif %}
+                                Status: <b>{{ EVENT_STATUS }}</b><br/>
+                                Severity: <b>{{ EVENT_SEVERITY }}</b><br/>
 {% if EVENT_SEVERITY == "Resolved" %}
-                    Duration: <b>{{ EVENT_DURATION }}</b><br/>
+                                Duration: <b>{{ EVENT_DURATION }}</b><br/>
 {% endif %}
-                    Item: <b>{{ ITEM_NAME }}</b> ({{ ITEM_KEY }})<br/>
+                                Item: <b>{{ ITEM_NAME }}</b><br/>
-                    Previous/Last: {{ ITEM_PREVIOUSVALUE }} ==&gt; {{ ITEM_LASTVALUE }}
+                                Previous/Last: {{ ITEM_PREVIOUSVALUE }} ==&gt; {{ ITEM_LASTVALUE }}
-                <p><a href="{{ EVENT_URL }}">Event Details</a><br/></p>
+                            </span>
-                </td></tr>
+                        </td>
-			</table>
+                    </tr>
-		</td>
+                </table>
-	</tr>
+            </td>
-{% if GRAPH_CID|length > 0 %}
+        </tr>
-    <tr>
+        <tr>
-        <td align="center"><img src="{{ GRAPH_CID }}" /></td>
+            <td class="links">
-    </tr>
+                <div align=center>
+                    Event ID: <a href="{{ EVENTDETAILS_URL }}">{{ EVENT_ID }}</a> //
+                    Trigger ID: <a href="{{ TRIGGER_URL }}">{{ TRIGGER_ID }}</a> //
+                    Item ID: <a href="{{ ITEM_URL }}">{{ ITEM_ID }}</a> //
+                    Host ID: <a href="{{ HOST_URL }}">{{ HOST_ID }}</a>
+{% if GRAPH_ZABBIXLINK|length > 0 %}
+                    // Graph ID: <a href="{{ GRAPH_ZABBIXLINK }}">{{ GRAPH_ID }}</a>
 {% endif %}
-</table>
+                    // <a href="{{ ACK_URL }}">Ack</a>
-    <p style="font-size:10px">
+                </div>
-        Event ID: <a href="{{ EVENT_URL }}">{{ EVENT_ID }}</a> //
+            </td>
-        Trigger ID: <a href="{{ TRIGGER_URL }}">{{ TRIGGER_ID }}</a> //
+        </tr>
-        Item ID: <a href="{{ ITEM_URL }}">{{ ITEM_ID }}</a> //
+{% for aGraph in GRAPHS_I %}
-        Host ID: <a href="{{ HOST_URL }}">{{ HOST_ID }}</a>
+        <tr>
-    </p>
+            <div align=justify>
+                <td align="center">
+                    <span class="graphHeader">{{ aGraph.HEADER }}</span><br/>
+                    <img id="mainimage" border=0 style="width: 100%; max-width: 790px" alt="Zabbix Graph" src="{{ aGraph.CID }}" />
+                </td>
+            </div>
+        </tr>
+{% endfor %}
+{% if TRIGGER_SCREEN > 0 %}
+        <tr>
+            <div align=justify>
+                <td align="center">
+                    <span class="graphHeader">{{ GRAPHS_T_HEADER }} - {{ GRAPHS_T_PERIODHEADER }}</span>
+                </td>
+            </div>
+        </tr>
+        <tr>
+            <td class="links">
+                <div align="center">
+                    Screen ID: <a href="{{ GRAPHS_T_LINK }}">{{ TRIGGER_SCREEN }}</a>
+                </div>
+            </td>
+        </tr>
+    {% for aGraph in GRAPHS_T %}
+        <tr>
+            <div align=justify>
+                <td align="center">
+                    <img id="mainimage" border=0 style="width: 100%; max-width: 790px" alt="Zabbix Graph" src="{{ aGraph.CID }}" />
+                </td>
+            </div>
+        </tr>
+    {% endfor %}
+{% endif %}
+{% if HOST_SCREEN > 0 %}
+        <tr>
+            <div align=justify>
+                <td align="center">
+                    <span class="graphHeader">{{ GRAPHS_H_HEADER }} - {{ GRAPHS_H_PERIODHEADER }}</span>
+                </td>
+            </div>
+        </tr>
+        <tr>
+            <td class="links">
+                <div align="center">
+                    Screen ID: <a href="{{ GRAPHS_H_LINK }}">{{ HOST_SCREEN }}</a>
+                </div>
+            </td>
+        </tr>
+    {% for aGraph in GRAPHS_H %}
+        <tr>
+            <div align=justify>
+                <td align="center">
+                    <img id="mainimage" border=0 style="width: 100%; max-width: 790px" alt="Zabbix Graph" src="{{ aGraph.CID }}" />
+                </td>
+            </div>
+        </tr>
+    {% endfor %}
+{% endif %}
+    </table>
 </body>
-</html>
+</html>

templates/plain.template

@@ -3,10 +3,10 @@ EVENT INFORMATION #{{ EVENT_ID }}
 Severity:    {{ EVENT_SEVERITY }}
 Description: {{ EVENT_NAME }}
 
-{% if GRAPH_CID|length > 0 %}
+{% if GRAPH_CID1|length > 0 %}
-GRAPH #{{ GRAPH_ID }}
+GRAPH #{{ GRAPH_ID1 }}
-{{ GRAPH_URL }}
+{{ GRAPH_URL1 }}
-This graph will remain available for approx. the next 2 weeks only; use HTML reader after this period to view the graph.
+This graph will remain available for approx. the next 2 weeks only; use HTML reader after this period to view the graph that is embedded in the attached HTML version.
 {% endif %}
 
 TRIGGER #{{ TRIGGER_ID }}
@@ -18,12 +18,12 @@ Description:      {{ TRIGGER_DESCRIPTION }}
 ITEM #{{ ITEM_ID }}
 
 Name:  {{ ITEM_NAME }}
-Key:   {{ ITEM_KEY }}
 Value: {{ ITEM_LASTVALUE }}
+Previous: {{ ITEM_PREVIOUSVALUE }}
 
 HOST
 
 Name: {{ HOST_NAME }}
 
 EVENT DETAILS
-{{ baseURL }}/tr_events.php?triggerid={TRIGGER_ID}&eventid={EVENT_ID}
+{{ EVENTDETAILS_URL }}