tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 17:25:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

2009-12-16 Raul Mateos <raulofpandora@gmail.com>

Browse Source 
* linux/pandora_agent, linux/DEBIAN/make_deb_package.sh: Preparing 
	release changing version to final. Clean code.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2207 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2009-12-16 18:03:47 +00:00
parent 0246f61498
commit 17c644433f
3 changed files with 71 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_agents/ChangeLog
View File

@ -1,3 +1,8 @@
2009-12-16 Raul Mateos <raulofpandora@gmail.com>
* linux/pandora_agent, linux/DEBIAN/make_deb_package.sh: Preparing
release changing version to final. Clean code.
2009-12-09 Raul Mateos <raulofpandora@gmail.com> 2009-12-09 Raul Mateos <raulofpandora@gmail.com>
* linux/pandora_agent.conf: Added comments to all modules. This will * linux/pandora_agent.conf: Added comments to all modules. This will

4
pandora_agents/linux/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_agent_version="3.0.0.RC3" pandora_agent_version="3.0.0"
echo "Test if you has the tools for to make the packages." echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
@ -110,7 +110,7 @@ do
#delete "temp_package" in the path #delete "temp_package" in the path
final_path=${item#temp_package} final_path=${item#temp_package}
echo $md5" "$final_path >> temp_package/DEBIAN/md5sums echo $md5" "$final_path >> temp_package/DEBIAN/md5sums
fi fi
fi fi
done done

128
pandora_agents/linux/pandora_agent
View File

@ -7,7 +7,7 @@
# ********************************************************************** # **********************************************************************
AGENT_VERSION=3.0 AGENT_VERSION=3.0
AGENT_BUILD=090818 AGENT_BUILD=091216
# ********************************************************************** # **********************************************************************
# function configure_agent() # function configure_agent()
@ -215,36 +215,36 @@ function send_file {
if [ "$TRANSFER_MODE" == "tentacle" ] if [ "$TRANSFER_MODE" == "tentacle" ]
then then
eval tentacle_client -v -a $SERVER_IP -p $SERVER_PORT $TENTACLE_OPTS $FILE > /dev/null 2> $PANDORA_LOGFILE.err eval tentacle_client -v -a $SERVER_IP -p $SERVER_PORT $TENTACLE_OPTS $FILE > /dev/null 2> $PANDORA_LOGFILE.err
return $? return $?
fi fi
if [ "$TRANSFER_MODE" == "ssh" ] if [ "$TRANSFER_MODE" == "ssh" ]
then then
scp -P $SERVER_PORT $FILE pandora@$SERVER_IP:$SERVER_PATH > /dev/null 2> $PANDORA_LOGFILE.err scp -P $SERVER_PORT $FILE pandora@$SERVER_IP:$SERVER_PATH > /dev/null 2> $PANDORA_LOGFILE.err
return $? return $?
fi fi
if [ "$TRANSFER_MODE" == "ftp" ] if [ "$TRANSFER_MODE" == "ftp" ]
then then
BASENAME=`basename $FILE` BASENAME=`basename $FILE`
DIRNAME=`dirname $FILE` DIRNAME=`dirname $FILE`
ftp -n $SERVER_IP $SERVER_PORT > /dev/null 2> $PANDORA_LOGFILE.err <<FEOF1 ftp -n $SERVER_IP $SERVER_PORT > /dev/null 2> $PANDORA_LOGFILE.err <<FEOF1
quote USER pandora quote USER pandora
quote PASS $SERVER_PWD quote PASS $SERVER_PWD
lcd "$DIRNAME" lcd "$DIRNAME"
cd "$SERVER_PATH" cd "$SERVER_PATH"
put "$BASENAME" put "$BASENAME"
quit quit
FEOF1 FEOF1
return $? return $?
fi fi
if [ "$TRANSFER_MODE" == "local" ] if [ "$TRANSFER_MODE" == "local" ]
then then
cp $FILE $SERVER_PATH > /dev/null 2> $PANDORA_LOGFILE.err cp $FILE $SERVER_PATH > /dev/null 2> $PANDORA_LOGFILE.err
return $? return $?
fi fi
return 1 return 1
@ -303,7 +303,7 @@ function recv_file {
fi fi
if [ "$TRANSFER_MODE" == "ftp" ] if [ "$TRANSFER_MODE" == "ftp" ]
then then
ftp -n $SERVER_IP $SERVER_PORT > /dev/null 2> $PANDORA_LOGFILE.err <<FEOF1 ftp -n $SERVER_IP $SERVER_PORT > /dev/null 2> $PANDORA_LOGFILE.err <<FEOF1
quote USER pandora quote USER pandora
quote PASS $SERVER_PWD quote PASS $SERVER_PWD
@ -313,12 +313,12 @@ get "$FILE"
quit quit
FEOF1 FEOF1
return $? return $?
fi fi
if [ "$TRANSFER_MODE" == "local" ] if [ "$TRANSFER_MODE" == "local" ]
then then
cp $SERVER_PATH/$FILE $TEMP > /dev/null 2> $PANDORA_LOGFILE.err cp $SERVER_PATH/$FILE $TEMP > /dev/null 2> $PANDORA_LOGFILE.err
return $? return $?
fi fi
return 1 return 1
@ -329,9 +329,9 @@ FEOF1
# Switches the values of var1 and var2 # Switches the values of var1 and var2
# ********************************************************************** # **********************************************************************
function switch { function switch {
eval "TEMP=\"\$$1\"" eval "TEMP=\"\$$1\""
eval "$1=\"\$$2\"" eval "$1=\"\$$2\""
eval "$2=\"\$TEMP\"" eval "$2=\"\$TEMP\""
} }
# ********************************************************************** # **********************************************************************
@ -422,7 +422,7 @@ then
echo " " echo " "
echo "Fatal error: I need an argument to Pandora FMS Agent config directory" echo "Fatal error: I need an argument to Pandora FMS Agent config directory"
echo " " echo " "
echo " example: pandora_agent /etc/pandora " echo " example: pandora_agent /etc/pandora"
echo " " echo " "
exit -1 exit -1
else else
@ -527,27 +527,27 @@ do
for a in `cat $PANDORA_HOME/pandora_agent.conf | grep -v -e "^#" | grep -e "^module" ` for a in `cat $PANDORA_HOME/pandora_agent.conf | grep -v -e "^#" | grep -e "^module" `
do do
a=`echo $a | tr -s " " " "` a=`echo $a | tr -s " " " "`
if [ ! -z "`echo $a | grep -e '^module_exec'`" ] if [ ! -z "`echo $a | grep -e '^module_exec'`" ]
then then
if [ $EXECUTE -eq 0 ] if [ $EXECUTE -eq 0 ]
then then
execution=`echo $a | cut -c 13- ` execution=`echo $a | cut -c 13- `
res=`eval $execution` res=`eval $execution`
if [ -z "$flux_string" ] if [ -z "$flux_string" ]
then then
res=`eval expr $res 2> $PANDORA_LOGFILE.err` res=`eval expr $res 2> $PANDORA_LOGFILE.err`
fi fi
echo "<data><![CDATA[$res]]></data>" >> $DATA2 echo "<data><![CDATA[$res]]></data>" >> $DATA2
fi fi
fi fi
if [ ! -z "`echo $a | grep -e '^module_name'`" ] if [ ! -z "`echo $a | grep -e '^module_name'`" ]
then then
name=`echo $a | cut -c 13- ` name=`echo $a | cut -c 13- `
echo "<name><![CDATA[$name]]></name>" >> $DATA2 echo "<name><![CDATA[$name]]></name>" >> $DATA2
fi fi
if [ ! -z "`echo $a | grep -e '^module_begin'`" ] if [ ! -z "`echo $a | grep -e '^module_begin'`" ]
then then
@ -572,40 +572,40 @@ do
desc=`echo $a | cut -c 20- ` desc=`echo $a | cut -c 20- `
echo "<description><![CDATA[$desc]]></description>" >> $DATA2 echo "<description><![CDATA[$desc]]></description>" >> $DATA2
fi fi
if [ ! -z "`echo $a | grep -e '^module_end'`" ] if [ ! -z "`echo $a | grep -e '^module_end'`" ]
then then
echo "</module>" >> $DATA2 echo "</module>" >> $DATA2
MODULE_END=1 MODULE_END=1
else else
MODULE_END=0 MODULE_END=0
fi fi
if [ ! -z "`echo $a | grep -e '^module_type'`" ] if [ ! -z "`echo $a | grep -e '^module_type'`" ]
then then
mtype=`echo $a | awk '{ print $2 }' ` mtype=`echo $a | awk '{ print $2 }' `
if [ ! -z "`echo $mtype | grep 'generic_data_string'`" ] || [ ! -z "`echo $mtype | grep 'async_string'`" ] if [ ! -z "`echo $mtype | grep 'generic_data_string'`" ] || [ ! -z "`echo $mtype | grep 'async_string'`" ]
then then
flux_string=1 flux_string=1
else else
flux_string=0 flux_string=0
unset flux_string unset flux_string
fi fi
echo "<type><![CDATA[$mtype]]></type>" >> $DATA2 echo "<type><![CDATA[$mtype]]></type>" >> $DATA2
fi fi
if [ ! -z "`echo $a | grep '^module_interval'`" ] if [ ! -z "`echo $a | grep '^module_interval'`" ]
then then
# Determine if execution is to be done # Determine if execution is to be done
MODULEINTERVAL=`echo $a | awk '{ print $2 }'` MODULEINTERVAL=`echo $a | awk '{ print $2 }'`
EXECUTE=`expr \( $CONTADOR + 1 \) % $MODULEINTERVAL` EXECUTE=`expr \( $CONTADOR + 1 \) % $MODULEINTERVAL`
fi fi
# Plugin execution # Plugin execution
if [ ! -z "`echo $a | grep '^module_plugin'`" ] if [ ! -z "`echo $a | grep '^module_plugin'`" ]
then then
PLUGIN=`echo $a | cut -d" " -f2` PLUGIN=`echo $a | cut -d" " -f2`
PARAMS=`echo $a | cut -d" " -f3-` PARAMS=`echo $a | cut -d" " -f3-`
if [ -f $PANDORA_HOME/plugins/$PLUGIN ] if [ -f $PANDORA_HOME/plugins/$PLUGIN ]
then then
eval $PANDORA_HOME/plugins/$PLUGIN $PARAMS >> $DATA eval $PANDORA_HOME/plugins/$PLUGIN $PARAMS >> $DATA
@ -615,7 +615,7 @@ do
fi fi
# Module postprocess info # Module postprocess info
if [ ! -z "`echo $a | grep -e '^module_postprocess'`" ] if [ ! -z "`echo $a | grep -e '^module_postprocess'`" ]
then then
pprocess=`echo $a | cut -d" " -f2-` pprocess=`echo $a | cut -d" " -f2-`
echo "<postprocess><![CDATA[$pprocess]]></postprocess>" >> $DATA2 echo "<postprocess><![CDATA[$pprocess]]></postprocess>" >> $DATA2