diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 0b7e1d99e1..7bc3bf7d21 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-11  Sancho Lerena <slerena@artica.es>
+
+	* util/pandora_xml_stress.conf: Updated conf file to use the new
+	threshold values in the generation of xml. 
+
 2013-03-11  Ramon Novoa  <rnovoa@artica.es>
 
 	* util/pandora_xml_stress.pl: Added support for critical and warning
diff --git a/pandora_server/util/pandora_xml_stress.conf b/pandora_server/util/pandora_xml_stress.conf
index df875b4968..5cfcc22f8e 100644
--- a/pandora_server/util/pandora_xml_stress.conf
+++ b/pandora_server/util/pandora_xml_stress.conf
@@ -32,13 +32,13 @@ os_version 2.6
 #group Servers
 
 # Agent interval, by default 300.
-agent_interval 900
+agent_interval 300
 
 # Data file generation start date, by default now.
-#time_from 2012-12-15 00:00:00
+#time_from 2013-03-11 00:00:00
 
 # Data file generation end date, by default now.
-#time_to 2013-01-09 00:00:00
+#time_to 2013-03-21 00:00:00
 
 # Get conf from Pandora Server
 get_and_send_agent_conf 0
@@ -85,6 +85,8 @@ module_type generic_data
 module_description Network connections used in this machine
 module_exec type=RANDOM;variation=20;min=50;max=500
 module_unit conns
+module_min_critical 450
+module_min_warning 400
 module_end
 
 module_begin
@@ -101,6 +103,7 @@ module_type generic_data
 module_description Network throughtput for incoming data
 module_exec type=RANDOM;variation=50;min=0;max=1000000
 module_unit kbit/sec
+module_min_critical 900000
 module_end
 
 module_begin
@@ -109,6 +112,7 @@ module_type generic_data
 module_description Network throughtput for Outgoing data
 module_exec type=RANDOM;variation=50;min=0;max=1000000
 module_unit kbit/sec
+module_min_critical 900000
 module_end
 
 module_begin
@@ -124,6 +128,8 @@ module_type generic_data
 module_description % of CPU usage in this machine
 module_unit %
 module_exec type=SCATTER;prob=5;avg=10;min=0;max=80
+module_min_critical 90
+module_min_warning 60
 module_end
 
 module_begin
@@ -132,14 +138,19 @@ module_type generic_data
 module_description Disk space available in MB.
 module_unit MB
 module_exec type=CURVE;min=20;max=80;time_wave_length=3600;time_offset=0
+module_min_critical 0
+module_max_critical 10
+module_max_warning 20
+module_min_warning 10
 module_end
 
 module_begin
 module_name Memory_free
 module_type generic_data
-module_description RAM memory available in MB.
 module_unit MB
 module_exec type=CURVE;min=5;max=8000;time_wave_length=360000;time_offset=0
+module_min_critical 0
+module_max_critical 50
 module_end
 
 module_begin
@@ -149,9 +160,9 @@ module_description Messages from the system in logfile format
 module_exec type=RANDOM;variation=60;min=40;max=40
 module_end
 
-module_begin
-module_name Module source
-module_type generic_data
-module_description Module data generated from source
-module_exec type=SOURCE;src=/usr/share/pandora_server/util/pandora_xml_stress_module_source.txt
-module_end
+#module_begin
+#module_name Module source
+#module_type generic_data
+#module_description Module data generated from source
+#module_exec type=SOURCE;src=/usr/share/pandora_server/util/pandora_xml_stress_module_source.txt
+#module_end