From c0aea1e6b720c16d535d373ff751e4200f1a229c Mon Sep 17 00:00:00 2001
From: mkoetzing <mkoetzing@users.noreply.github.com>
Date: Tue, 17 Nov 2020 13:24:13 +0100
Subject: [PATCH 1/2] Update snmpparser.sh

zabbix was not able to read snmp messages from /tmp/zabbix_traps.tmp

changed the format of the first line of each message
---
 snmpparser.sh | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/snmpparser.sh b/snmpparser.sh
index c1429dc..b838c53 100644
--- a/snmpparser.sh
+++ b/snmpparser.sh
@@ -11,13 +11,22 @@ while read oid val
 do
   if [ "$vars" = "" ]
   then
-    vars="$oid = $val"
+    vars="$oid = $val \r\n"
   else
-    vars="$vars, $oid = $val"
+    vars="$vars \r\n $oid = $val"
   fi
 done
 
 
-[[ ${host} =~ ((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?) ]] && NUM=${BASH_REMATCH}
+#[[ ${host} =~ ((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?) ]] && NUM=${BASH_REMATCH}
+# printf "%(%H:%M:%S %Y/%m/%d)T ZBXTRAP $NUM\r\n$host $ip $vars\r\n">> /tmp/zabbix_traps.tmp
+#echo trap: $1 $host $ip $vars 
 
-printf "ZBXTRAP $NUM\r\n$host $ip $vars\r\n">> /tmp/zabbix_traps.tmp
+
+
+sourceAndDest=$(grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' <<< $ip) 
+stringarray=($sourceAndDest) 
+source=${stringarray[0]} 
+destination=${stringarray[1]}
+
+printf "%(%H:%M:%S %Y/%m/%d)T ZBXTRAP $destination \r\n $NUM \r\n $host \r\n $ip \r\n $vars\r\n">> /tmp/zabbix_traps.tmp

From 6d1dbc4b79ca868930afb56ddf33155dcffd0c17 Mon Sep 17 00:00:00 2001
From: mkoetzing <mkoetzing@users.noreply.github.com>
Date: Tue, 17 Nov 2020 14:26:44 +0100
Subject: [PATCH 2/2] Update snmpparser.sh

wrong parameter
---
 snmpparser.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snmpparser.sh b/snmpparser.sh
index b838c53..46de8a7 100644
--- a/snmpparser.sh
+++ b/snmpparser.sh
@@ -29,4 +29,4 @@ stringarray=($sourceAndDest)
 source=${stringarray[0]} 
 destination=${stringarray[1]}
 
-printf "%(%H:%M:%S %Y/%m/%d)T ZBXTRAP $destination \r\n $NUM \r\n $host \r\n $ip \r\n $vars\r\n">> /tmp/zabbix_traps.tmp
+printf "%(%H:%M:%S %Y/%m/%d)T ZBXTRAP $source \r\n $NUM \r\n $host \r\n $ip \r\n $vars\r\n">> /tmp/zabbix_traps.tmp