- very basic support for SNMP trapping (Alexei)

git-svn-id: svn://svn.zabbix.com/trunk@673 97f52cf1-0a1b-0410-bd0e-c28be96e8082

4 files changed, 38 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index cbe06eb7..4361b5bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Changes for 1.0beta8:
 
+ - very basic support for SNMP trapping (Alexei)
  - added misc/snmptrap/snmptrap.sh (Alexei)
  - group selection for Item configuration form (Alexei)
  - added support for SLA level in IT Services (Alexei)
diff --git a/TODO b/TODO
index 630875f7..9bcf9b39 100644
--- a/TODO
+++ b/TODO
@@ -2,7 +2,6 @@ TOP PRIORITY:
 
  - improve graphing capabilities
  - support for net-snmp
- - SNMP trapping
 
 BUGS:
 
diff --git a/misc/pinger/pinger.pl b/misc/pinger/pinger.pl
index 048d01d0..c933bd43 100755
--- a/misc/pinger/pinger.pl
+++ b/misc/pinger/pinger.pl
@@ -24,6 +24,7 @@
 $ZABBIX_SERVER="zabbix";
 $ZABBIX_PORT="10001";
 $HOST_FILE="hosts";
+$KEY="alive";
 $TMP_FILE="/tmp/zabbix.pinger.tmp";
 
 $ZABBIX_SENDER="zabbix_sender";
@@ -40,12 +41,12 @@ foreach $host (split(/\n/,$hosts))
 {
 	if($host=~/^((.)*) is alive$/)
 	{
-		$str="$ZABBIX_SERVER $ZABBIX_PORT $1:alive 1"; 
+		$str="$ZABBIX_SERVER $ZABBIX_PORT $1:$KEY 1"; 
 	}
 	else
 	{
 		$host=~/^((.)*) is((.)*)$/;
-		$str="$ZABBIX_SERVER $ZABBIX_PORT $1:alive 0"; 
+		$str="$ZABBIX_SERVER $ZABBIX_PORT $1:$KEY 0"; 
 	}
 	printf F "%s\n",$str;
 }
diff --git a/misc/snmptrap/snmptrap.sh b/misc/snmptrap/snmptrap.sh
index fbbe2f7a..444b5e76 100755
--- a/misc/snmptrap/snmptrap.sh
+++ b/misc/snmptrap/snmptrap.sh
@@ -1,5 +1,35 @@
 #!/bin/bash
 
+# 
+# Zabbix
+# Copyright (C) 2000,2001,2002,2003 Alexei Vladishev
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+
+# CONFIGURATION
+
+ZABBIX_SERVER="zabbix";
+ZABBIX_PORT="10001";
+
+ZABBIX_SENDER="~zabbix/bin/zabbix_sender";
+
+KEY="snmptraps";
+HOST="snmptraps";
+
+# END OF CONFIGURATION
 
 read hostname
 read ip
@@ -19,10 +49,8 @@ community=`echo $community|cut -f2 -d'"'`
 
 str="$hostname $address $community $enterprise $oid"
 
-#echo $oid >>/tmp/log
-#echo $address >>/tmp/log
-#echo $community >>/tmp/log
-#echo $enterprise >>/tmp/log
-
->/tmp/log
 echo $str >>/tmp/log
+
+cmd="$ZABBIX_SERVER $ZABBIX_PORT $HOST:$KEY \"$str\""
+
+echo $cmd