2007-06-04 Raúl Mateos <rmateos@netscape.net>

* pandora_server, pandora_network, pandora_snmpconsole: Added FMS text.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@485 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2007-06-04 13:45:35 +00:00
parent 28988b44ea
commit 0c6bda173f
4 changed files with 33 additions and 29 deletions

View File

@ -1,21 +1,25 @@
2007-06-04 Raúl Mateos <rmateos@netscape.net>
* pandora_server, pandora_network, pandora_snmpconsole: Added FMS text.
2007-05-24 Sancho Lerena <slerena@artica.es> 2007-05-24 Sancho Lerena <slerena@artica.es>
* conf/pandora_server.conf: Added support for dbname option. * conf/pandora_server.conf: Added support for dbname option.
* pandora_snmpconsole: Version and bash header updated. * pandora_snmpconsole: Version and bash header updated.
* bin/pandora_config.pm: Added support for dbname option. Added * bin/pandora_config.pm: Added support for dbname option. Added
some default options for DB. some default options for DB.
* bin/pandora_db.pm: Fixed stupid bug in alert execution. Added * bin/pandora_db.pm: Fixed stupid bug in alert execution. Added
support for dbname option and other minor fixes. support for dbname option and other minor fixes.
* bin/pandora_server.pl, * bin/pandora_server.pl,
bin/pandora_network.pl, bin/pandora_network.pl,
bin/pandora_snmpconsole.pl, bin/pandora_snmpconsole.pl,
bin/pandora_recon.pl: Added support for dbname option. bin/pandora_recon.pl: Added support for dbname option.
* pandora_server: Version update * pandora_server: Version update
2007-05-21 Sancho Lerena <slerena@artica.es> 2007-05-21 Sancho Lerena <slerena@artica.es>

View File

@ -13,7 +13,7 @@ PANDORA_NETWORK_PID="$PANDORA_HOME/var/pandora_network.pid"
if [ ! -f $PANDORA_HOME/bin/pandora_network.pl ] if [ ! -f $PANDORA_HOME/bin/pandora_network.pl ]
then then
echo "Pandora Network Server not found, please check setup and read manual" echo "Pandora FMS Network Server not found, please check setup and read manual"
exit exit
fi fi
@ -22,7 +22,7 @@ case "$1" in
OLD_PATH="`pwd`" OLD_PATH="`pwd`"
if [ -f $PANDORA_NETWORK_PID ] if [ -f $PANDORA_NETWORK_PID ]
then then
echo "Pandora Network Server is currently running on this machine. Aborting now..." echo "Pandora FMS Network Server is currently running on this machine. Aborting now..."
exit exit
fi fi
@ -34,14 +34,14 @@ case "$1" in
echo $MYPID > $PANDORA_NETWORK_PID echo $MYPID > $PANDORA_NETWORK_PID
echo "Pandora Network Server is now running with PID $MYPID" echo "Pandora Network Server is now running with PID $MYPID"
else else
echo "Cannot start Pandora Network Server. Aborted" echo "Cannot start Pandora FMS Network Server. Aborted"
fi fi
cd "$OLD_PATH" cd "$OLD_PATH"
;; ;;
stop) stop)
if [ -f $PANDORA_NETWORK_PID ] if [ -f $PANDORA_NETWORK_PID ]
then then
echo "Stopping Pandora Network Server" echo "Stopping Pandora FMS Network Server"
PID_2=`cat $PANDORA_NETWORK_PID` PID_2=`cat $PANDORA_NETWORK_PID`
if [ ! -z "`ps -F -p $PID_2 | grep -v grep | grep 'pandora_network'`" ] if [ ! -z "`ps -F -p $PID_2 | grep -v grep | grep 'pandora_network'`" ]
then then
@ -49,7 +49,7 @@ case "$1" in
fi fi
rm -f $PANDORA_NETWORK_PID rm -f $PANDORA_NETWORK_PID
else else
echo "Pandora Network Server is not running, cannot stop it." echo "Pandora FMS Network Server is not running, cannot stop it."
fi fi
;; ;;
force-reload|restart) force-reload|restart)

View File

@ -2,7 +2,7 @@
# Pandora Data Server startup script # Pandora Data Server startup script
# Sancho Lerena, <slerena@gmail.com> # Sancho Lerena, <slerena@gmail.com>
# Linux Version (generic) # Linux Version (generic)
# v1.3 (May/2006) # v1.3 (May/2007)
# Configurable path and filenames # Configurable path and filenames
PANDORA_HOME="/usr/share/pandora_server" PANDORA_HOME="/usr/share/pandora_server"
@ -12,7 +12,7 @@ PANDORA_SERVER_PID="$PANDORA_HOME/var/pandora_server.pid"
if [ ! -f $PANDORA_HOME/bin/pandora_server.pl ] if [ ! -f $PANDORA_HOME/bin/pandora_server.pl ]
then then
echo "Pandora Data Server not found, please check setup and read manual" echo "Pandora FMS Data Server not found, please check setup and read manual"
exit exit
fi fi
@ -21,7 +21,7 @@ case "$1" in
OLD_PATH="`pwd`" OLD_PATH="`pwd`"
if [ -f $PANDORA_SERVER_PID ] if [ -f $PANDORA_SERVER_PID ]
then then
echo "Pandora Data Server is currently running on this machine. Aborting now..." echo "Pandora FMS Data Server is currently running on this machine. Aborting now..."
exit exit
fi fi
@ -31,16 +31,16 @@ case "$1" in
if [ ! -z "$MYPID" ] if [ ! -z "$MYPID" ]
then then
echo $MYPID > $PANDORA_SERVER_PID echo $MYPID > $PANDORA_SERVER_PID
echo "Pandora Data Server is now running with PID $MYPID" echo "Pandora FMS Data Server is now running with PID $MYPID"
else else
echo "Cannot start Pandora Data Server. Aborted" echo "Cannot start Pandora FMS Data Server. Aborted"
fi fi
cd "$OLD_PATH" cd "$OLD_PATH"
;; ;;
stop) stop)
if [ -f $PANDORA_SERVER_PID ] if [ -f $PANDORA_SERVER_PID ]
then then
echo "Stopping Pandora Data Server" echo "Stopping Pandora FMS Data Server"
PID_2=`cat $PANDORA_SERVER_PID` PID_2=`cat $PANDORA_SERVER_PID`
if [ ! -z "`ps -F -p $PID_2 | grep -v grep | grep 'pandora_server'`" ] if [ ! -z "`ps -F -p $PID_2 | grep -v grep | grep 'pandora_server'`" ]
then then
@ -48,7 +48,7 @@ case "$1" in
fi fi
rm -f $PANDORA_SERVER_PID rm -f $PANDORA_SERVER_PID
else else
echo "Pandora Data Server is not running, cannot stop it." echo "Pandora FMS Data Server is not running, cannot stop it."
fi fi
;; ;;
force-reload|restart) force-reload|restart)
@ -56,7 +56,7 @@ case "$1" in
$0 start $0 start
;; ;;
*) *)
echo "Usage: pandora_network {start|stop|restart}" echo "Usage: pandora_server {start|stop|restart}"
exit 1 exit 1
esac esac

View File

@ -2,7 +2,7 @@
# Startup script for Pandora SNMP Console # Startup script for Pandora SNMP Console
# Sancho Lerena, <slerena@gmail.com> # Sancho Lerena, <slerena@gmail.com>
# Linux Version(generic) # Linux Version(generic)
# v1.3 (May/2006) # v1.3 (May/2007)
# Compatible with NetSNMP 5.1 or higher # Compatible with NetSNMP 5.1 or higher
@ -44,7 +44,7 @@ case "$1" in
if [ -f $PANDORA_SNMP_PID ] if [ -f $PANDORA_SNMP_PID ]
then then
echo "Pandora SNMP Console is currently running on this machine. Aborting now..." echo "Pandora FMS SNMP Server is currently running on this machine. Aborting now..."
exit exit
fi fi
@ -54,9 +54,9 @@ case "$1" in
if [ ! -z "$MYPID" ] if [ ! -z "$MYPID" ]
then then
echo $MYPID > $PANDORA_SNMP_PID echo $MYPID > $PANDORA_SNMP_PID
echo "Pandora SNMP Console is now running with PID $MYPID" echo "Pandora FMS SNMP Server is now running with PID $MYPID"
else else
echo "Cannot start Pandora Network Server. Aborted" echo "Cannot start Pandora FMS SNMP Server. Aborted"
fi fi
cd "$OLD_PATH" cd "$OLD_PATH"
;; ;;
@ -85,7 +85,7 @@ case "$1" in
fi fi
rm -f $PANDORA_SNMP_PID rm -f $PANDORA_SNMP_PID
else else
echo "Pandora SNMP Console is not running, cannot stop it." echo "Pandora FMS SNMP Console is not running, cannot stop it."
fi fi
;; ;;
force-reload|restart) force-reload|restart)