.........T [ZBX-21672] fixed event source in mediatypes

* commit 'c06bc6489b0c9d51b95c007eab24383ef57657d7':
  .........T [ZBX-21672] fixed event source in mediatypes
  .........T [ZBX-21672] fixed event source in mediatypes

2 files changed, 108 insertions, 27 deletions

diff --git a/templates/media/discord/media_discord.yaml b/templates/media/discord/media_discord.yaml
index 2d33f319d77..045612b3ae4 100644
--- a/templates/media/discord/media_discord.yaml
+++ b/templates/media/discord/media_discord.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2020-10-16T09:33:47Z'
+  version: '6.4'
+  date: '2022-10-06T13:46:05Z'
   media_types:
     -
       name: Discord
@@ -117,8 +117,8 @@ zabbix_export:
             params.zabbix_url = (params.zabbix_url.endsWith('/'))
                 ? params.zabbix_url.slice(0, -1) : params.zabbix_url;
         
-            if ([0, 1, 2, 3].indexOf(parseInt(params.event_source)) === -1) {
-                throw 'Incorrect "event_source" parameter given: "' + params.event_source + '".\nMust be 0-3.';
+            if ([0, 1, 2, 3, 4].indexOf(parseInt(params.event_source)) === -1) {
+                throw 'Incorrect "event_source" parameter given: "' + params.event_source + '".\nMust be 0-4.';
             }
         
             // Set params to true for non trigger-based events.
@@ -343,3 +343,37 @@ zabbix_export:
             Host name: {HOST.HOST}
             Host IP: {HOST.IP}
             Agent port: {HOST.PORT}
+        -
+          event_source: SERVICE
+          operation_mode: PROBLEM
+          subject: 'Service "{SERVICE.NAME}" problem: {EVENT.NAME}'
+          message: |
+            Service problem started at {EVENT.TIME} on {EVENT.DATE}
+            Service problem name: {EVENT.NAME}
+            Service: {SERVICE.NAME}
+            Severity: {EVENT.SEVERITY}
+            Original problem ID: {EVENT.ID}
+            Service description: {SERVICE.DESCRIPTION}
+            
+            {SERVICE.ROOTCAUSE}
+        -
+          event_source: SERVICE
+          operation_mode: RECOVERY
+          subject: 'Service "{SERVICE.NAME}" resolved in {EVENT.DURATION}: {EVENT.NAME}'
+          message: |
+            Service "{SERVICE.NAME}" has been resolved at {EVENT.RECOVERY.TIME} on {EVENT.RECOVERY.DATE}
+            Problem name: {EVENT.NAME}
+            Problem duration: {EVENT.DURATION}
+            Severity: {EVENT.SEVERITY}
+            Original problem ID: {EVENT.ID}
+            Service description: {SERVICE.DESCRIPTION}
+        -
+          event_source: SERVICE
+          operation_mode: UPDATE
+          subject: 'Changed "{SERVICE.NAME}" service status to {EVENT.UPDATE.SEVERITY} in {EVENT.AGE}'
+          message: |
+            Changed "{SERVICE.NAME}" service status to {EVENT.UPDATE.SEVERITY} at {EVENT.UPDATE.DATE} {EVENT.UPDATE.TIME}.
+            Current problem age is {EVENT.AGE}.
+            Service description: {SERVICE.DESCRIPTION}
+            
+            {SERVICE.ROOTCAUSE}
diff --git a/templates/media/msteams/media_msteams.yaml b/templates/media/msteams/media_msteams.yaml
index d128bde7897..bd9a064707f 100644
--- a/templates/media/msteams/media_msteams.yaml
+++ b/templates/media/msteams/media_msteams.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2022-06-07T04:55:32Z'
+  version: '6.4'
+  date: '2022-10-06T13:46:30Z'
   media_types:
     -
       name: 'MS Teams'
@@ -101,7 +101,7 @@ zabbix_export:
         
         try {
             var params = JSON.parse(value);
-
+        
             if (typeof params.teams_endpoint !== 'string' || params.teams_endpoint.trim() === '') {
                 throw 'Cannot get teams_endpoint';
             }
@@ -112,8 +112,8 @@ zabbix_export:
             params.zabbix_url = (params.zabbix_url.endsWith('/'))
                 ? params.zabbix_url.slice(0, -1) : params.zabbix_url;
         
-            if ([0, 1, 2, 3].indexOf(parseInt(params.event_source)) === -1) {
-                throw 'Incorrect "event_source" parameter given: "' + params.event_source + '".\nMust be 0-3.';
+            if ([0, 1, 2, 3, 4].indexOf(parseInt(params.event_source)) === -1) {
+                throw 'Incorrect "event_source" parameter given: "' + params.event_source + '".\nMust be 0-4.';
             }
         
             // Set "use_default_message" to true for non trigger-based events.
@@ -149,7 +149,6 @@ zabbix_export:
                         {
                             markdown: 'false',
                             activityTitle: params.alert_subject,
-                            activitySubtitle: 'On ' + params.host_name + ' [' + params.host_ip + ']',
                             text: (params.use_default_message.toLowerCase() == 'true')
                                 ? params.alert_message
                                 : params.trigger_description
@@ -181,6 +180,11 @@ zabbix_export:
                         name: 'Event time',
                         value: params.event_time + ' ' + params.event_date
                     });
+                    facts.push({
+                        name: 'Host',
+                        value: params.host_name + ' [' + params.host_ip + ']'
+                    });
+
                 }
                 // Update message.
                 else if (params.event_update_status === '1') {
@@ -194,6 +198,11 @@ zabbix_export:
                         name: 'Event update time',
                         value: params.event_update_time + ' ' + params.event_update_date
                     });
+                    facts.push({
+                        name: 'Host',
+                        value: params.host_name + ' [' + params.host_ip + ']'
+                    });
+
                 }
                 // Resolved message.
                 else {
@@ -201,6 +210,10 @@ zabbix_export:
                         name: 'Recovery time',
                         value: params.event_recovery_time + ' ' + params.event_recovery_date
                     });
+                    facts.push({
+                        name: 'Host',
+                        value: params.host_name + ' [' + params.host_ip + ']'
+                    });
                 }
         
                 if (params.event_severity && params.event_severity !== '{EVENT.SEVERITY}') {
@@ -277,6 +290,38 @@ zabbix_export:
         }
       message_templates:
         -
+          event_source: TRIGGERS
+          operation_mode: PROBLEM
+          subject: 'Problem: {EVENT.NAME}'
+          message: |
+            Problem started at {EVENT.TIME} on {EVENT.DATE}
+            Problem name: {EVENT.NAME}
+            Host: {HOST.NAME}
+            Severity: {EVENT.SEVERITY}
+            Operational data: {EVENT.OPDATA}
+            Original problem ID: {EVENT.ID}
+            {TRIGGER.URL}
+        -
+          event_source: TRIGGERS
+          operation_mode: RECOVERY
+          subject: 'Resolved: {EVENT.NAME}'
+          message: |
+            Problem has been resolved in {EVENT.DURATION} at {EVENT.RECOVERY.TIME} on {EVENT.RECOVERY.DATE}
+            Problem name: {EVENT.NAME}
+            Host: {HOST.NAME}
+            Severity: {EVENT.SEVERITY}
+            Original problem ID: {EVENT.ID}
+            {TRIGGER.URL}
+        -
+          event_source: TRIGGERS
+          operation_mode: UPDATE
+          subject: 'Updated problem: {EVENT.NAME}'
+          message: |
+            {USER.FULLNAME} {EVENT.UPDATE.ACTION} problem at {EVENT.UPDATE.DATE} {EVENT.UPDATE.TIME}.
+            {EVENT.UPDATE.MESSAGE}
+            
+            Current problem status is {EVENT.STATUS}, acknowledged: {EVENT.ACK.STATUS}.
+        -
           event_source: DISCOVERY
           operation_mode: PROBLEM
           subject: 'Discovery: {DISCOVERY.DEVICE.STATUS} {DISCOVERY.DEVICE.IPADDRESS}'
@@ -301,34 +346,36 @@ zabbix_export:
             Host IP: {HOST.IP}
             Agent port: {HOST.PORT}
         -
-          event_source: TRIGGERS
+          event_source: SERVICE
           operation_mode: PROBLEM
-          subject: 'Problem: {EVENT.NAME}'
+          subject: 'Service "{SERVICE.NAME}" problem: {EVENT.NAME}'
           message: |
-            Problem started at {EVENT.TIME} on {EVENT.DATE}
-            Problem name: {EVENT.NAME}
-            Host: {HOST.NAME}
+            Service problem started at {EVENT.TIME} on {EVENT.DATE}
+            Service problem name: {EVENT.NAME}
+            Service: {SERVICE.NAME}
             Severity: {EVENT.SEVERITY}
-            Operational data: {EVENT.OPDATA}
             Original problem ID: {EVENT.ID}
-            {TRIGGER.URL}
+            Service description: {SERVICE.DESCRIPTION}
+            
+            {SERVICE.ROOTCAUSE}
         -
-          event_source: TRIGGERS
+          event_source: SERVICE
           operation_mode: RECOVERY
-          subject: 'Resolved: {EVENT.NAME}'
+          subject: 'Service "{SERVICE.NAME}" resolved in {EVENT.DURATION}: {EVENT.NAME}'
           message: |
-            Problem has been resolved in {EVENT.DURATION} at {EVENT.RECOVERY.TIME} on {EVENT.RECOVERY.DATE}
+            Service "{SERVICE.NAME}" has been resolved at {EVENT.RECOVERY.TIME} on {EVENT.RECOVERY.DATE}
             Problem name: {EVENT.NAME}
-            Host: {HOST.NAME}
+            Problem duration: {EVENT.DURATION}
             Severity: {EVENT.SEVERITY}
             Original problem ID: {EVENT.ID}
-            {TRIGGER.URL}
+            Service description: {SERVICE.DESCRIPTION}
         -
-          event_source: TRIGGERS
+          event_source: SERVICE
           operation_mode: UPDATE
-          subject: 'Updated problem: {EVENT.NAME}'
+          subject: 'Changed "{SERVICE.NAME}" service status to {EVENT.UPDATE.SEVERITY} in {EVENT.AGE}'
           message: |
-            {USER.FULLNAME} {EVENT.UPDATE.ACTION} problem at {EVENT.UPDATE.DATE} {EVENT.UPDATE.TIME}.
-            {EVENT.UPDATE.MESSAGE}
+            Changed "{SERVICE.NAME}" service status to {EVENT.UPDATE.SEVERITY} at {EVENT.UPDATE.DATE} {EVENT.UPDATE.TIME}.
+            Current problem age is {EVENT.AGE}.
+            Service description: {SERVICE.DESCRIPTION}
             
-            Current problem status is {EVENT.STATUS}, acknowledged: {EVENT.ACK.STATUS}.
+            {SERVICE.ROOTCAUSE}