From aeb3a3c06ca0e4af7dac9a13a269252d0a92df05 Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Tue, 22 Jan 2013 08:59:53 +0000 Subject: [PATCH] 2013-01-22 Juan Manuel Ramon * util/pandora_xml_stress.conf util/pandora_xml_stress.pl: Added group parameter in pandora stress generator. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7516 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 6 ++++++ pandora_server/util/pandora_xml_stress.conf | 7 +++++-- pandora_server/util/pandora_xml_stress.pl | 3 ++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index b9271d35fc..cd073f09b1 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,9 @@ +2013-01-22 Juan Manuel Ramon + + * util/pandora_xml_stress.conf + util/pandora_xml_stress.pl: Added group parameter in pandora stress + generator. + 2013-01-17 Ramon Novoa * lib/PandoraFMS/Config.pm, diff --git a/pandora_server/util/pandora_xml_stress.conf b/pandora_server/util/pandora_xml_stress.conf index 46580a758b..df875b4968 100644 --- a/pandora_server/util/pandora_xml_stress.conf +++ b/pandora_server/util/pandora_xml_stress.conf @@ -28,14 +28,17 @@ os_name Linux # Operating system version (shared by all agents), by default 2.6. os_version 2.6 +# Agent group, by default Servers. +#group Servers + # Agent interval, by default 300. agent_interval 900 # Data file generation start date, by default now. -#time_from 2012-03-01 00:00:00 +#time_from 2012-12-15 00:00:00 # Data file generation end date, by default now. -#time_to 2012-04-01 00:00:00 +#time_to 2013-01-09 00:00:00 # Get conf from Pandora Server get_and_send_agent_conf 0 diff --git a/pandora_server/util/pandora_xml_stress.pl b/pandora_server/util/pandora_xml_stress.pl index a843ff3a19..d166f59d92 100755 --- a/pandora_server/util/pandora_xml_stress.pl +++ b/pandora_server/util/pandora_xml_stress.pl @@ -102,6 +102,7 @@ sub generate_xml_files ($$$$$$) { my $longitude_base = get_conf_token ($conf, 'longitude_base', '-3.708187'); my $altitude_base = get_conf_token ($conf, 'altitude_base', '0'); my $position_radius = get_conf_token ($conf, 'position_radius', '10'); + my $group = get_conf_token ($conf, 'group', 'Servers'); # Get time_from my $time_now = strftime ("%Y-%m-%d %H:%M:%S", localtime ()); @@ -140,7 +141,7 @@ sub generate_xml_files ($$$$$$) { my $xml_data = "\n"; my $sign = int rand(2); $ag_timezone_offset += ($sign*(-1)+(1-$sign)) * int rand($ag_timezone_offset_range); - $xml_data .= "\n"; + $xml_data .= "\n"; foreach my $module (@{$modules}) { # Skip unnamed modules