syslog-ng fixes awaiting rsyslog patch :D

git-svn-id: http://www.observium.org/svn/observer/trunk@1966 61d68cd4-352d-0410-923a-c4978735b2b8

contrib/syslog-ng.conf.pipe

@@ -24,9 +24,9 @@ source s_net {
 };
 
 destination d_mysql {
-	pipe("/var/log/observer-mysql.pipe"
+	pipe("/var/log/mysql-observium.pipe"
 	template("INSERT INTO syslog
-	(host, facility, priority, level, tag, datetime, program, msg)
+	(host, facility, priority, level, tag, timestamp, program, msg)
 	VALUES ( '$HOST', '$FACILITY', '$PRIORITY', '$LEVEL', '$TAG', '$YEAR-$MONTH-$DAY $HOUR:$MIN:$SEC','$PROGRAM', '$MSG' );\n") template-escape(yes));
 }; 
 

contrib/syslog2mysql.sh

@@ -1,10 +1,16 @@
-#!/bin/bash
+#!/bin/sh
 
-if [ ! -e /var/log/observernms-mysql.pipe ]
+MYSQLDB=observium
-then
+MYSQLUSER=syslog
-mkfifo /var/log/observernms-mysql.pipe
+MYSQLPASS=<something>
+PIPE=/var/log/mysql-observium.pipe
+
+
+if [ -e $PIPE ]; then
+        while [ -e $PIPE ]
+                do
+                        mysql -u$MYSQLUSER --password=$MYSQLPASS $MYSQLDB < $PIPE
+        done
+else
+        mkfifo $PIPE
 fi
-while [ -e /var/log/observernms-mysql.pipe ]
-do
-mysql -u observernms --password=password observernms < /var/log/observernms-mysql.pipe >/dev/null
-done 

database-update.sql

@@ -28,4 +28,4 @@ ALTER TABLE sensors MODIFY sensor_descr VARCHAR(255);
 ALTER TABLE `vrfs` MODIFY  `mplsVpnVrfRouteDistinguisher` VARCHAR(128);
 ALTER TABLE `vrfs` MODIFY  `vrf_name` VARCHAR(128);
 ALTER TABLE `ports` MODIFY  `ifDescr` VARCHAR(255);
-
+ALTER TABLE  `syslog` ADD  `host` VARCHAR( 128 ) NULL AFTER  `device_id`;