Fixed exec parameters of default media type - closes #29

erigones · Mar 22, 2017 · 02aff6a · 02aff6a
1 parent f381a3d
commit 02aff6a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/ansible/roles/esdc-mon/tasks/04-zabbix.yml b/ansible/roles/esdc-mon/tasks/04-zabbix.yml
@@ -111,6 +111,7 @@
       description: "SMS"
       type: 1  # script
       exec_path: "sms.sh"
+      exec_params: "{ALERT.SENDTO}\n{ALERT.SUBJECT}\n{ALERT.MESSAGE}\n"
   register: sms_media_type
 
 - name: Create Ludolph media type (script)
@@ -123,6 +124,7 @@
       description: "Ludolph"
       type: 1  # script
       exec_path: "ludolph.sh"
+      exec_params: "{ALERT.SENDTO}\n{ALERT.SUBJECT}\n{ALERT.MESSAGE}\n"
 
 - name: Create Prowl media type (script)
   zabbix:
@@ -134,6 +136,7 @@
       description: "Prowl"
       type: 1  # script
       exec_path: "prowl.sh"
+      exec_params: "{ALERT.SENDTO}\n{ALERT.SUBJECT}\n{ALERT.MESSAGE}\n"
 
 - name: Create NMA media type (script)
   zabbix:
@@ -145,6 +148,7 @@
       description: "NMA"
       type: 1  # script
       exec_path: "nma.sh"
+      exec_params: "{ALERT.SENDTO}\n{ALERT.SUBJECT}\n{ALERT.MESSAGE}\n"
 
 - name: Create ICMP_LOSS macro
   zabbix:

diff --git a/docs/appliances.rst b/docs/appliances.rst
@@ -334,6 +334,7 @@ Changelog
 - Added sample SMS escalation action - commit `7c4f488 <https://github.com/erigones/esdc-factory/commit/7c4f4886d74750d35a988a74988abafefcb4e8ec>`__
 - Added sample Zabbix alert scripts - commit `d4a1c4c <https://github.com/erigones/esdc-factory/commit/d4a1c4c6659c702f22bff92456527e8adcd99b8a>`__
 - Added network interface monitoring into t_erigones-zone + small fixes - commit `bc37060 <https://github.com/erigones/esdc-factory/commit/bc37060b5ac77740cb0a3ae034f1cc339acd5b0d>`__
+- Fixed exec parameters of default media types - `#29 <https://github.com/erigones/esdc-factory/issues/29>`__
 - Fixed FS discovery in t_linux and t_erigonos templates - `#30 <https://github.com/erigones/esdc-factory/issues/30>`__
 
 2.5.1