diff --git a/contrib/syslog-ng.conf.pipe b/contrib/syslog-ng.conf.pipe index 6637e26524..1730b009ca 100644 --- a/contrib/syslog-ng.conf.pipe +++ b/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)); }; diff --git a/contrib/syslog2mysql.sh b/contrib/syslog2mysql.sh index b6d50c9f59..a3793b9c85 100755 --- a/contrib/syslog2mysql.sh +++ b/contrib/syslog2mysql.sh @@ -1,10 +1,16 @@ -#!/bin/bash +#!/bin/sh -if [ ! -e /var/log/observernms-mysql.pipe ] -then -mkfifo /var/log/observernms-mysql.pipe +MYSQLDB=observium +MYSQLUSER=syslog +MYSQLPASS= +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 diff --git a/database-update.sql b/database-update.sql index 8788c88cd1..8284e34477 100644 --- a/database-update.sql +++ b/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`;