tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-04-04 Dario Rodriguez <dario.rodriguez@artica.es> 

* plugins/pandora_update: Modified plugin for agent autoupdate.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4162 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
darode 2011-04-04 09:33:35 +00:00
parent e9cfbf4160
commit 40219f78c3
2 changed files with 67 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_agents/unix/ChangeLog
View File

@ -1,3 +1,7 @@
2011-04-04 Dario Rodriguez <dario.rodriguez@artica.es>
* plugins/pandora_update: Modified plugin for agent autoupdate.
2011-03-09 Ramon Novoa <rnovoa@artica.es> 2011-03-09 Ramon Novoa <rnovoa@artica.es>
* pandora_agent: Fixed a typo. * pandora_agent: Fixed a typo.

76
pandora_agents/unix/plugins/pandora_update
View File

@ -82,6 +82,40 @@ sub compare_twofiles ($$) {
return 0; return 0;
} }
# Get agent pid
sub get_agent_pid ($$) {
my $daemon = shift;
my $app_path = shift;
$ENV{'COLUMNS'}=400;
my $os_name=`uname -s`;
my $pid = "";
my $cmd = "";
if ($os_name eq "HP-UX") {
$cmd ="ps -ex | grep \"$daemon $app_path\" | grep -v grep | head -1 | awk '{ print \$1 }'";
}
elsif ($os_name eq "SunOS") {
my $cmd_aux="echo \"$daemon $app_path\" | cut -c1-40";
my $truncated_daemon = `$cmd_aux`;
my $zone = `/bin/zonename`;
if ( $zone eq "global") {
$cmd ="ps -f -z global | grep \"$truncated_daemon\" | grep -v grep | head -1 | awk '{ print \$2 }'";
} else {
$cmd ="ps -Af | grep \"$truncated_daemon\" | grep -v grep | head -1 | awk '{ print \$2 }'";
}
} else {
$cmd ="ps -Af | grep \"$daemon $app_path\" | grep -v grep | head -1 | awk '{ print \$2 }'";
}
$pid = `$cmd`;
return $pid;
}
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
# MAIN CODE starts here # MAIN CODE starts here
@ -89,14 +123,19 @@ sub compare_twofiles ($$) {
# Get the required path (relative to basepath) to find pandora agent binary # Get the required path (relative to basepath) to find pandora agent binary
if ($#ARGV != 0) { if ($#ARGV < 0) {
print "Usage: $0 <relative path (filecollection id) to updated binary \n"; print "Usage: $0 <relative path (filecollection id) [custom_path]\n";
print "For example: $0 fc2 \n\n"; print "For example: $0 fc2 /var/opt/PandoraFMS\n\n";
exit 1; exit 1;
} }
my $fc_path = $ARGV[0]; my $fc_path = $ARGV[0];
my $base_path = return_basepath(); my $base_path = return_basepath();
my $opt_dir = "";
if (defined($ARGV[1])) {
$opt_dir = $ARGV[1];
}
# Setup your particular paths / process settings here # Setup your particular paths / process settings here
# [SETUP BEGIN] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # [SETUP BEGIN] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -107,13 +146,15 @@ my $base_path = return_basepath();
my $running_binary; my $running_binary;
my $updated_binary; my $updated_binary;
if ($^O eq 'freebsd') { if ($^O eq 'freebsd') {
$running_binary = "/usr/local/bin/pandora_agent"; $running_binary = $opt_dir."/usr/local/bin/pandora_agent";
$updated_binary = "/usr/local/etc/pandora/collections/$fc_path/pandora_agent"; $updated_binary = $opt_dir."/usr/local/etc/pandora/collections/$fc_path/pandora_agent";
} else { } else {
$running_binary = "/usr/bin/pandora_agent"; $running_binary = $opt_dir."/usr/bin/pandora_agent";
$updated_binary = "/etc/pandora/collections/$fc_path/pandora_agent"; $updated_binary = $opt_dir."/etc/pandora/collections/$fc_path/pandora_agent";
} }
my $conf_path = $opt_dir."/etc/pandora";
# Windows # Windows
#my $running_binary = $base_path."/../PandoraAgent.exe"; #my $running_binary = $base_path."/../PandoraAgent.exe";
@ -126,11 +167,11 @@ if ($^O eq 'freebsd') {
my $start_pandora; my $start_pandora;
my $stop_pandora; my $stop_pandora;
if ($^O eq 'freebsd') { if ($^O eq 'freebsd') {
$start_pandora = "/usr/local/etc/rc.d/pandora_agent start"; $start_pandora = $opt_dir."/usr/local/etc/rc.d/pandora_agent start";
$stop_pandora = "/usr/local/etc/rc.d/pandora_agent stop"; $stop_pandora = $opt_dir."/usr/local/etc/rc.d/pandora_agent stop";
} else { } else {
$start_pandora = "/etc/init.d/pandora_agent_daemon start"; $start_pandora = $opt_dir."/etc/init.d/pandora_agent_daemon start";
$stop_pandora = "/etc/init.d/pandora_agent_daemon stop"; $stop_pandora = $opt_dir."/etc/init.d/pandora_agent_daemon stop";
} }
# Windows stuff # Windows stuff
@ -155,10 +196,19 @@ if (compare_twofiles ($running_binary, $updated_binary) == 0 ){
open (FILE3,">$local_log"); open (FILE3,">$local_log");
close (FILE3); close (FILE3);
my $output = `$stop_pandora`; my $ppid = get_agent_pid($running_binary, $conf_path);
# Kill parent process (a.k.a the Agent)
my $output = `kill -9 $ppid`;
sleep SERVICE_STOP_WAIT; sleep SERVICE_STOP_WAIT;
# Copy the updated agent
copy($updated_binary, $running_binary) or unlink $local_log; copy($updated_binary, $running_binary) or unlink $local_log;
$output = `$start_pandora`;
# Starting the agent again
my $log = $opt_dir."/var/log/pandora/pandora_agent.log";
$output = `nohup $running_binary $conf_path >/dev/null 2>$log &`
} else { } else {
if (-e $local_log){ if (-e $local_log){