tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

2013-09-02 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* util/pandora_xml_stress.pl: fixed perl warning and set the default
	temp directory correctly.
	
	* util/pandora_xml_stress.conf: added lost parameters
	"directory_confs" and "directory_temp".




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8725 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-09-02 07:20:10 +00:00
parent b9e7f1883b
commit 041ab06cdc
3 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_server/ChangeLog
View File

@ -1,3 +1,11 @@
2013-09-02 Miguel de Dios <miguel.dedios@artica.es>
* util/pandora_xml_stress.pl: fixed perl warning and set the default
temp directory correctly.
* util/pandora_xml_stress.conf: added lost parameters
"directory_confs" and "directory_temp".
2013-08-29 Miguel de Dios <miguel.dedios@artica.es> 2013-08-29 Miguel de Dios <miguel.dedios@artica.es>
* lib/PandoraFMS/Core.pm: into the function "pandora_module_unknown" * lib/PandoraFMS/Core.pm: into the function "pandora_module_unknown"

6
pandora_server/util/pandora_xml_stress.conf
View File

@ -43,6 +43,12 @@ agent_interval 300
# Get conf from Pandora Server # Get conf from Pandora Server
get_and_send_agent_conf 0 get_and_send_agent_conf 0
# The directory to store the files conf agent (not in the server).
# directory_confs .
# The directory to generate the next files conf agent for to send.
#directory_temp /tmp
# Delay after generating the first data file for each agent to avoid # Delay after generating the first data file for each agent to avoid
# race conditions when auto-creating the agent, by default 2. # race conditions when auto-creating the agent, by default 2.
startup_delay 1 startup_delay 1

26
pandora_server/util/pandora_xml_stress.pl
View File

@ -61,7 +61,7 @@ sub load_config ($\%\@) {
next if ($line =~ m/^#/); next if ($line =~ m/^#/);
last if ($line =~ m/module_end/); last if ($line =~ m/module_end/);
# Unknown line # Unknown line
next if ($line !~ /^\s*(\w+)\s+(.+)$/); next if ($line !~ /^\s*(\w+)\s+(.+)$/);
@ -95,6 +95,7 @@ sub generate_xml_files ($$$$$$) {
my $os_name = get_conf_token ($conf, 'os_name', 'Linux'); my $os_name = get_conf_token ($conf, 'os_name', 'Linux');
my $os_version = get_conf_token ($conf, 'os_version', '2.6'); my $os_version = get_conf_token ($conf, 'os_version', '2.6');
my $temporal = get_conf_token ($conf, 'temporal', '/tmp'); my $temporal = get_conf_token ($conf, 'temporal', '/tmp');
my $startup_delay = get_conf_token ($conf, 'startup_delay', '5'); my $startup_delay = get_conf_token ($conf, 'startup_delay', '5');
my $ag_timezone_offset = get_conf_token ($conf, 'timezone_offset', '0'); my $ag_timezone_offset = get_conf_token ($conf, 'timezone_offset', '0');
my $ag_timezone_offset_range = get_conf_token ($conf, 'timezone_offset_range', '0'); my $ag_timezone_offset_range = get_conf_token ($conf, 'timezone_offset_range', '0');
@ -107,12 +108,14 @@ sub generate_xml_files ($$$$$$) {
# Get time_from # Get time_from
my $time_now = strftime ("%Y-%m-%d %H:%M:%S", localtime ()); my $time_now = strftime ("%Y-%m-%d %H:%M:%S", localtime ());
my $time_from = get_conf_token ($conf, 'time_from', $time_now); my $time_from = get_conf_token ($conf, 'time_from', $time_now);
die ("[error] Invalid time_from: $time_from\n\n") unless ($time_from =~ /(\d+)\-(\d+)\-(\d+) +(\d+):(\d+):(\d+)/); die ("[error] Invalid time_from: $time_from\n\n")
unless ($time_from =~ /(\d+)\-(\d+)\-(\d+) +(\d+):(\d+):(\d+)/);
my $utimestamp_from = timelocal($6, $5, $4, $3, $2 - 1, $1 - 1900); my $utimestamp_from = timelocal($6, $5, $4, $3, $2 - 1, $1 - 1900);
# Get time_to # Get time_to
my $time_to = get_conf_token ($conf, 'time_to', $time_now); my $time_to = get_conf_token ($conf, 'time_to', $time_now);
die ("[error] Invalid time_to: $time_to\n\n") unless ($time_to =~ /(\d+)\-(\d+)\-(\d+) +(\d+):(\d+):(\d+)/); die ("[error] Invalid time_to: $time_to\n\n")
unless ($time_to =~ /(\d+)\-(\d+)\-(\d+) +(\d+):(\d+):(\d+)/);
my $utimestamp_to = timelocal($6, $5, $4, $3, $2 - 1, $1 - 1900); my $utimestamp_to = timelocal($6, $5, $4, $3, $2 - 1, $1 - 1900);
my %modules_src_pointers = init_src_pointers($modules); my %modules_src_pointers = init_src_pointers($modules);
@ -562,13 +565,13 @@ sub leftrotate ($$) {
############################################################################### ###############################################################################
my (@R, @K); my (@R, @K);
sub md5_init () { sub md5_init () {
# R specifies the per-round shift amounts # R specifies the per-round shift amounts
@R = (7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, @R = (7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22,
5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20,
4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23,
6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21); 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21);
# Use binary integer part of the sines of integers (radians) as constants # Use binary integer part of the sines of integers (radians) as constants
for (my $i = 0; $i < 64; $i++) { for (my $i = 0; $i < 64; $i++) {
$K[$i] = floor(abs(sin($i + 1)) * MOD232); $K[$i] = floor(abs(sin($i + 1)) * MOD232);
@ -672,7 +675,7 @@ sub md5 ($) {
################################################################################ ################################################################################
sub send_file($$) { sub send_file($$) {
my $file = shift; my $file = shift;
my $conf = shift;printf($file . "\n"); my $conf = shift;
my $output; my $output;
my $server_ip = get_conf_token($conf, 'server_ip', ''); my $server_ip = get_conf_token($conf, 'server_ip', '');
my $server_port = get_conf_token($conf, 'server_port', '41121'); my $server_port = get_conf_token($conf, 'server_port', '41121');
@ -682,6 +685,7 @@ sub send_file($$) {
# $DevNull # $DevNull
my $DevNull = '/dev/null'; my $DevNull = '/dev/null';
$output = `tentacle_client -v -a $server_ip -p $server_port $tentacle_options $file 2>&1 >$DevNull`; $output = `tentacle_client -v -a $server_ip -p $server_port $tentacle_options $file 2>&1 >$DevNull`;
# Get the errorlevel # Get the errorlevel
@ -700,7 +704,7 @@ sub recv_file ($$) {
my $file = shift; my $file = shift;
my $conf = shift; my $conf = shift;
my $output; my $output;
my $directory_temp = get_conf_token($conf, 'directory_temp', '/tmp/'); my $directory_temp = get_conf_token($conf, 'directory_temp', '/tmp');
my $server_ip = get_conf_token($conf, 'server_ip', ''); my $server_ip = get_conf_token($conf, 'server_ip', '');
my $server_port = get_conf_token($conf, 'server_port', '41121'); my $server_port = get_conf_token($conf, 'server_port', '41121');
my $tentacle_options = get_conf_token($conf, 'tentacle_options', ''); my $tentacle_options = get_conf_token($conf, 'tentacle_options', '');
@ -734,7 +738,7 @@ sub get_and_send_agent_conf(\@\%\@\%) {
my $get_and_send_agent_conf = get_conf_token($conf, 'get_and_send_agent_conf', '0'); my $get_and_send_agent_conf = get_conf_token($conf, 'get_and_send_agent_conf', '0');
my $directory_confs = get_conf_token($conf, 'directory_confs', '.'); my $directory_confs = get_conf_token($conf, 'directory_confs', '.');
my $directory_temp = get_conf_token($conf, 'directory_temp', '/tmp/'); my $directory_temp = get_conf_token($conf, 'directory_temp', '/tmp');
my $md5_agent_name = ''; my $md5_agent_name = '';
if ($get_and_send_agent_conf == 1) { if ($get_and_send_agent_conf == 1) {
@ -748,6 +752,7 @@ sub get_and_send_agent_conf(\@\%\@\%) {
# Get the remote MD5 file # Get the remote MD5 file
if (recv_file("$md5_agent_name.md5", $conf) != 0) { if (recv_file("$md5_agent_name.md5", $conf) != 0) {
#The remote agent don't recive, then it send the agent conf and md5. #The remote agent don't recive, then it send the agent conf and md5.
open (MD5_FILE, ">$directory_temp/$md5_agent_name.md5") open (MD5_FILE, ">$directory_temp/$md5_agent_name.md5")
|| log_message ($conf, "\tERROR:\tCould not open file '$directory_temp/$md5_agent_name.md5' for writing: $!."); || log_message ($conf, "\tERROR:\tCould not open file '$directory_temp/$md5_agent_name.md5' for writing: $!.");
@ -760,6 +765,8 @@ sub get_and_send_agent_conf(\@\%\@\%) {
log_message ($conf, "\tINFO:\tUploading configuration for the first time."); log_message ($conf, "\tINFO:\tUploading configuration for the first time.");
unlink ("$directory_temp/$md5_agent_name.conf"); unlink ("$directory_temp/$md5_agent_name.conf");
unlink ("$directory_temp/$md5_agent_name.md5"); unlink ("$directory_temp/$md5_agent_name.md5");
} }
else { else {
#There is a remote agent. #There is a remote agent.
@ -778,6 +785,7 @@ sub get_and_send_agent_conf(\@\%\@\%) {
} }
} }
} }
} }
else { else {
log_message ($conf, "\tWARNING:\tThere is not the $agent.conf .'\n"); log_message ($conf, "\tWARNING:\tThere is not the $agent.conf .'\n");
@ -790,7 +798,7 @@ sub get_and_send_agent_conf(\@\%\@\%) {
# Create the block of modules. # Create the block of modules.
foreach my $module (@{$modules}) { foreach my $module (@{$modules}) {
$temp .= " $temp = $temp . "
module_begin module_begin
module_name " . $module->{'module_name'} . " module_name " . $module->{'module_name'} . "
module_type " . $module->{'module_type'} . " module_type " . $module->{'module_type'} . "