summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--misc/conf/zabbix_trapper.conf25
-rw-r--r--misc/conf/zabbix_trapperd.conf30
-rw-r--r--src/zabbix_trapper/zabbix_trapper.c4
4 files changed, 58 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b02109a..f342d17d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Changes for 1.0beta1:
(Add description of new tables and column URL to the manual)
(snmptrap -v 1 127.0.0.1 public '' localhost 3 0 '' interfaces.ifTable.ifEntry.ifIndex.1 i 1)
+ - added sample zabbix_trapper(d).conf to misc/conf (Alexei)
- support for configuration file for zabbix_trapper(d) (Alexei)
- support for DB* parameters in zabbix_suckerd.conf (Alexei)
- not supported items will not be shown in latest values (Alexei)
diff --git a/misc/conf/zabbix_trapper.conf b/misc/conf/zabbix_trapper.conf
new file mode 100644
index 00000000..3692d7d6
--- /dev/null
+++ b/misc/conf/zabbix_trapper.conf
@@ -0,0 +1,25 @@
+# This is config file for zabbix_trapper
+# To get more information about Zabbix,
+# go http://zabbix.sourceforge.net
+
+############ GENERAL PARAMETERS #################
+
+# Specifies debug level
+# 1 - critical information
+# 2 - warnings (default)
+# 3 - for debugging (produces lots of information)
+
+DebugLevel=2
+
+# Database name
+
+DBName=zabbix
+
+# Database user
+
+DBUser=zabbix
+
+# Database password
+# Comment this line if no password used
+
+#DBPassword=<password>
diff --git a/misc/conf/zabbix_trapperd.conf b/misc/conf/zabbix_trapperd.conf
new file mode 100644
index 00000000..8a8f7adb
--- /dev/null
+++ b/misc/conf/zabbix_trapperd.conf
@@ -0,0 +1,30 @@
+# This is config file for zabbix_suckerd
+# To get more information about Zabbix,
+# go http://zabbix.sourceforge.net
+
+############ GENERAL PARAMETERS #################
+
+# Number of pre-forked instances of zabbix_trapperd
+# Default value is 5
+# This parameter must be between 2 and 255
+StartTrappers=5
+
+# Specifies debug level
+# 1 - critical information
+# 2 - warnings (default)
+# 3 - for debugging (produces lots of information)
+
+DebugLevel=2
+
+# Database name
+
+DBName=zabbix
+
+# Database user
+
+DBUser=zabbix
+
+# Database password
+# Comment this line if no password used
+
+#DBPassword=<password>
diff --git a/src/zabbix_trapper/zabbix_trapper.c b/src/zabbix_trapper/zabbix_trapper.c
index d3368f1e..786374ef 100644
--- a/src/zabbix_trapper/zabbix_trapper.c
+++ b/src/zabbix_trapper/zabbix_trapper.c
@@ -57,10 +57,10 @@ void process_config_file(void)
int lineno;
- file=fopen("/etc/zabbix/zabbix_trapperd.conf","r");
+ file=fopen("/etc/zabbix/zabbix_trapper.conf","r");
if(NULL == file)
{
- syslog( LOG_CRIT, "Cannot open /etc/zabbix/zabbix_trapperd.conf");
+ syslog( LOG_CRIT, "Cannot open /etc/zabbix/zabbix_trapper.conf");
exit(1);
}