Pandora FMS: Flexible Monitoring System

Revision: 7924
          http://pandora.svn.sourceforge.net/pandora/?rev=7924&view=rev
Author:   junichi-satoh
Date:     2013-04-04 00:35:54 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
2013-04-04  Junichi Satoh <junichi@...>

	* pandora_server_installer: As the same as Linux, changed cron setting
	of maintenance process for BSD to hourly.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/pandora_server_installer

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-04-03 12:17:00 UTC (rev 7923)
+++ trunk/pandora_server/ChangeLog	2013-04-04 00:35:54 UTC (rev 7924)
@@ -1,3 +1,8 @@
+2013-04-04  Junichi Satoh <junichi@...>
+
+	* pandora_server_installer: As the same as Linux, changed cron setting
+	of maintenance process for BSD to hourly.
+	
 2013-04-03  Junichi Satoh <junichi@...>
 
 	* pandora_server_installer, Makefile.PL: Added support for NetBSD.

Modified: trunk/pandora_server/pandora_server_installer
===================================================================
--- trunk/pandora_server/pandora_server_installer	2013-04-03 12:17:00 UTC (rev 7923)
+++ trunk/pandora_server/pandora_server_installer	2013-04-04 00:35:54 UTC (rev 7924)
@@ -438,7 +438,7 @@
 				if [ $? -ne 0 ]
 				then
 					echo "# Pandora FMS" >> /etc/crontab
-					echo "2 0       *       *       *       root    perl /usr/local/share/pandora_server/util/pandora_db.pl /usr/local/etc/pandora/pandora_server.conf" >> /etc/crontab
+					echo "2	*	*	*	*	root	perl /usr/local/share/pandora_server/util/pandora_db.pl /usr/local/etc/pandora/pandora_server.conf" >> /etc/crontab
 				else
 					echo "The crontab for pandora_db.pl is already configured."
 				fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7937
          http://pandora.svn.sourceforge.net/pandora/?rev=7937&view=rev
Author:   junichi-satoh
Date:     2013-04-07 06:37:29 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
2013-04-07  Junichi Satoh <junichi@...>

	* Makefile.PL: Changed library installation path for NetBSD.

	* pandora_server_installer: Fixed wrong permission of tentacle_server
	for BSD.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/Makefile.PL
    trunk/pandora_server/pandora_server_installer

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-04-05 13:07:03 UTC (rev 7936)
+++ trunk/pandora_server/ChangeLog	2013-04-07 06:37:29 UTC (rev 7937)
@@ -1,3 +1,10 @@
+2013-04-07  Junichi Satoh <junichi@...>
+
+	* Makefile.PL: Changed library installation path for NetBSD.
+
+	* pandora_server_installer: Fixed wrong permission of tentacle_server
+	for BSD.
+
 2013-04-04  Junichi Satoh <junichi@...>
 
 	* pandora_server_installer: As the same as Linux, changed cron setting

Modified: trunk/pandora_server/Makefile.PL
===================================================================
--- trunk/pandora_server/Makefile.PL	2013-04-05 13:07:03 UTC (rev 7936)
+++ trunk/pandora_server/Makefile.PL	2013-04-07 06:37:29 UTC (rev 7937)
@@ -7,7 +7,7 @@
 		? (INSTALLSITELIB => '') : ()
 	),
 	($^O eq 'netbsd') ? (
-		INSTALLSITELIB => '/usr/pkg/lib/perl5',
+		INSTALLSITELIB => '',
 		INSTALLSITESCRIPT => '/usr/local/bin',
 	) :(),
 

Modified: trunk/pandora_server/pandora_server_installer
===================================================================
--- trunk/pandora_server/pandora_server_installer	2013-04-05 13:07:03 UTC (rev 7936)
+++ trunk/pandora_server/pandora_server_installer	2013-04-07 06:37:29 UTC (rev 7937)
@@ -399,6 +399,7 @@
 					echo "Installing tentacle server"
 					cp bin/tentacle_server /usr/local/bin
 					chown pandora /usr/local/bin/tentacle_server
+					chmod 555 /usr/local/bin/tentacle_server
 					cp FreeBSD/tentacle_server $TENTACLE_SERVER
 					chmod 555 $TENTACLE_SERVER
 					echo "Installing Tentacle Server manual"
@@ -409,6 +410,7 @@
 					echo "Installing tentacle server"
 					cp bin/tentacle_server /usr/local/bin
 					chown pandora /usr/local/bin/tentacle_server
+					chmod 555 /usr/local/bin/tentacle_server
 					cp NetBSD/tentacle_server $TENTACLE_SERVER
 					chmod 555 $TENTACLE_SERVER
 					echo "Installing Tentacle Server manual"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7939
          http://pandora.svn.sourceforge.net/pandora/?rev=7939&view=rev
Author:   hkosaka
Date:     2013-04-08 03:09:05 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
2013-04-08 Hirofumi Kosaka <kosaka@...>

	* util/pandora_server: Small improvement. Pinned target
	process id to be killed when stopping Pandora Server, to avoid
	to kill other processes that could be invoked in different
	session by chance.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/util/pandora_server

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-04-07 06:53:53 UTC (rev 7938)
+++ trunk/pandora_server/ChangeLog	2013-04-08 03:09:05 UTC (rev 7939)
@@ -1,3 +1,10 @@
+2013-04-08 Hirofumi Kosaka <kosaka@...>
+
+	* util/pandora_server: Small improvement. Pinned target
+	process id to be killed when stopping Pandora Server, to avoid
+	to kill other processes that could be invoked in different
+	session by chance.
+
 2013-04-07  Junichi Satoh <junichi@...>
 
 	* Makefile.PL: Changed library installation path for NetBSD.

Modified: trunk/pandora_server/util/pandora_server
===================================================================
--- trunk/pandora_server/util/pandora_server	2013-04-07 06:53:53 UTC (rev 7938)
+++ trunk/pandora_server/util/pandora_server	2013-04-08 03:09:05 UTC (rev 7939)
@@ -108,8 +108,8 @@
 
 		while [ $COUNTER -lt $MAXWAIT ]
 	 		do
- 				PANDORA_PID=`pidof_pandora`
-				if [ -z "$PANDORA_PID" ]
+ 				_PID=`pidof_pandora`
+				if [ "$_PID" != "$PANDORA_PID" ]
  				then
 					COUNTER=$MAXWAIT
 				fi
@@ -119,7 +119,7 @@
 		
 			# Send a KILL -9 signal to process, if it's alive after 60secs, we need
 			# to be sure is really dead, and not pretending...
-			if [ ! -z "$PANDORA_PID" ]
+			if [ "$_PID" = "$PANDORA_PID" ]
 			then
 				kill -9 $PANDORA_PID   > /dev/null 2>&1
 			fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7942
          http://pandora.svn.sourceforge.net/pandora/?rev=7942&view=rev
Author:   hkosaka
Date:     2013-04-08 08:43:44 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
2013-04-08 Hirofumi Kosaka <kosaka@...>

	* util/tentacle_serverd: Tiny improvement. Changed to use
	target process id to check if the process has been stopped.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/util/tentacle_serverd

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-04-08 03:45:56 UTC (rev 7941)
+++ trunk/pandora_server/ChangeLog	2013-04-08 08:43:44 UTC (rev 7942)
@@ -1,5 +1,10 @@
 2013-04-08 Hirofumi Kosaka <kosaka@...>
 
+	* util/tentacle_serverd: Tiny improvement. Changed to use
+	target process id to check if the process has been stopped.
+
+2013-04-08 Hirofumi Kosaka <kosaka@...>
+
 	* util/pandora_server: Small improvement. Pinned target
 	process id to be killed when stopping Pandora Server, to avoid
 	to kill other processes that could be invoked in different

Modified: trunk/pandora_server/util/tentacle_serverd
===================================================================
--- trunk/pandora_server/util/tentacle_serverd	2013-04-08 03:45:56 UTC (rev 7941)
+++ trunk/pandora_server/util/tentacle_serverd	2013-04-08 08:43:44 UTC (rev 7942)
@@ -113,9 +113,9 @@
 		else
 			kill $TENTACLE_PID
 			sleep 1
-			TENTACLE_PID=`get_pid`
+			_PID=`get_pid`
 
-			if [ ! -z "$TENTACLE_PID" ]; then
+			if [ "$_PID" = "$TENTACLE_PID" ]; then
 				echo "Tentacle Server could not be stopped"
 				rc_status -s
 			fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8001
          http://pandora.svn.sourceforge.net/pandora/?rev=8001&view=rev
Author:   ramonn
Date:     2013-04-17 10:49:47 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
2013-04-17  Ramon Novoa  <rnovoa@...>

	* lib/PandoraFMS/WMIServer.pm: Style fix.

	* lib/PandoraFMS/Core.pm,
	  lib/PandoraFMS/DataServer.pm: Added support for multiple ip
	  addresses.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/lib/PandoraFMS/Core.pm
    trunk/pandora_server/lib/PandoraFMS/DataServer.pm
    trunk/pandora_server/lib/PandoraFMS/WMIServer.pm

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-04-17 10:45:28 UTC (rev 8000)
+++ trunk/pandora_server/ChangeLog	2013-04-17 10:49:47 UTC (rev 8001)
@@ -1,3 +1,11 @@
+2013-04-17  Ramon Novoa  <rnovoa@...>
+
+	* lib/PandoraFMS/WMIServer.pm: Style fix.
+
+	* lib/PandoraFMS/Core.pm,
+	  lib/PandoraFMS/DataServer.pm: Added support for multiple ip
+	  addresses.
+
 2013-04-08 Hirofumi Kosaka <kosaka@...>
 
 	* util/tentacle_serverd: Tiny improvement. Changed to use

Modified: trunk/pandora_server/lib/PandoraFMS/Core.pm
===================================================================
--- trunk/pandora_server/lib/PandoraFMS/Core.pm	2013-04-17 10:45:28 UTC (rev 8000)
+++ trunk/pandora_server/lib/PandoraFMS/Core.pm	2013-04-17 10:49:47 UTC (rev 8001)
@@ -2434,11 +2434,9 @@
 ##########################################################################
 # Add an address if not exists and add this address to taddress_agent if not exists
 ##########################################################################
-sub pandora_add_agent_address ($$$$) {
-	my ($pa_config, $agent_id, $addr, $dbh) = @_;
-	
-	my $agent_name = get_agent_name($dbh, $agent_id);
-	
+sub pandora_add_agent_address ($$$$$) {
+	my ($pa_config, $agent_id, $agent_name, $addr, $dbh) = @_;
+		
 	# Add the new address if it does not exist
 	my $addr_id = get_addr_id ($dbh, $addr);
 	

Modified: trunk/pandora_server/lib/PandoraFMS/DataServer.pm
===================================================================
--- trunk/pandora_server/lib/PandoraFMS/DataServer.pm	2013-04-17 10:45:28 UTC (rev 8000)
+++ trunk/pandora_server/lib/PandoraFMS/DataServer.pm	2013-04-17 10:49:47 UTC (rev 8001)
@@ -262,8 +262,21 @@
 	
 	# Get agent address from the XML if available
 	my $address = '' ;
-	$address = $data->{'address'} if (defined ($data->{'address'}));
+	my @address_list;
+	if (defined ($data->{'address'}) && $data->{'address'} ne '') {
+		@address_list = split (',', $data->{'address'});
 
+		# Trim addresses
+		for (my $i = 0; $i <= $#address_list; $i++) {
+			$address_list[$i] =~ s/^\s+|\s+$//g ;
+		}
+		
+		# Save the first address as the main address
+		$address = $address_list[0];
+		$address =~ s/^\s+|\s+$//g ;
+		shift (@address_list);
+}
+	
 	# Get agent id
 	my $agent_id = get_agent_id ($dbh, $agent_name);
 	if ($agent_id < 1) {
@@ -294,6 +307,11 @@
 			return;
 		}
 		
+		# Add the main address to the address list
+		if ($address ne '') {
+			pandora_add_agent_address($pa_config, $agent_id, $agent_name, $address, $dbh);
+		}
+
 		# Process custom fields
 		if(defined($data->{'custom_fields'})) {
 			foreach my $custom_fields (@{$data->{'custom_fields'}}) {
@@ -345,17 +363,18 @@
 	}
 	# Learning mode
 	else { 
-		
-		# Update agent address if necessary
+	
+		# Update the main address
 		if ($address ne '' && $address ne $agent->{'direccion'}) {
-			
-			# Update the main address
 			pandora_update_agent_address ($pa_config, $agent_id, $agent_name, $address, $dbh);
-			
-			# Update the addres list if necessary
-			pandora_add_agent_address($pa_config, $agent_id, $address, $dbh);
+			pandora_add_agent_address($pa_config, $agent_id, $agent_name, $address, $dbh);
 		}
 		
+		# Update additional addresses
+		foreach my $address (@address_list) {
+			pandora_add_agent_address($pa_config, $agent_id, $agent_name, $address, $dbh);
+		}
+		
 		# Update parent if is allowed and is valid
 		if ($pa_config->{'update_parent'} == 1 && $parent_id != 0) {
 			logger($pa_config, "Updating agent $agent_name parent_id: $parent_id", 5);

Modified: trunk/pandora_server/lib/PandoraFMS/WMIServer.pm
===================================================================
--- trunk/pandora_server/lib/PandoraFMS/WMIServer.pm	2013-04-17 10:45:28 UTC (rev 8000)
+++ trunk/pandora_server/lib/PandoraFMS/WMIServer.pm	2013-04-17 10:49:47 UTC (rev 8001)
@@ -53,7 +53,7 @@
 	return undef unless $config->{'wmiserver'} == 1;
 
 	# Check for a WMI client
-	if (system ($config->{'wmi_client'} . ' > /dev/null 2>&1') != 256) {
+	if (system ($config->{'wmi_client'} . ' > /dev/null 2>&1') >> 8 != 1) {
 		logger ($config, ' [E] ' . $config->{'wmi_client'} . " not found. Pandora FMS WMI Server needs a DCOM/WMI client.", 1);
 		print_message ($config, ' [E] ' . $config->{'wmi_client'} . " not found. Pandora FMS WMI Server needs a DCOM/WMI client.", 1);
 		return undef;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8003
          http://pandora.svn.sourceforge.net/pandora/?rev=8003&view=rev
Author:   ramonn
Date:     2013-04-17 14:58:50 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
2013-04-17  Ramon Novoa  <rnovoa@...>

	* lib/PandoraFMS/Server.pm,
	  bin/pandora_server: Moved server tasks to their own thread. Fixes
	  bug #3609450.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/bin/pandora_server
    trunk/pandora_server/lib/PandoraFMS/Server.pm

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-04-17 14:45:17 UTC (rev 8002)
+++ trunk/pandora_server/ChangeLog	2013-04-17 14:58:50 UTC (rev 8003)
@@ -1,5 +1,11 @@
 2013-04-17  Ramon Novoa  <rnovoa@...>
 
+	* lib/PandoraFMS/Server.pm,
+	  bin/pandora_server: Moved server tasks to their own thread. Fixes
+	  bug #3609450.
+
+2013-04-17  Ramon Novoa  <rnovoa@...>
+
 	* lib/PandoraFMS/WMIServer.pm: Style fix.
 
 	* lib/PandoraFMS/Core.pm,

Modified: trunk/pandora_server/bin/pandora_server
===================================================================
--- trunk/pandora_server/bin/pandora_server	2013-04-17 14:45:17 UTC (rev 8002)
+++ trunk/pandora_server/bin/pandora_server	2013-04-17 14:58:50 UTC (rev 8003)
@@ -232,6 +232,94 @@
 	return 0;
 }
 
+########################################################################################
+# Additional tasks executed periodically by the Pandora FMS Server
+########################################################################################
+sub pandora_server_tasks ($) {
+	my ($pa_config) = @_;
+	
+	# Get the console DB connection
+	my $dbh = db_connect ($pa_config->{'dbengine'}, $pa_config->{'dbname'}, $pa_config->{'dbhost'}, $pa_config->{'dbport'},
+						$pa_config->{'dbuser'}, $pa_config->{'dbpass'});
+	
+	my $counter = 0;
+	while (1) {
+
+		# TASKS EXECUTED EVERY 5 SECONDS (Low latency tasks)
+		# --------------------------------------------------
+		if (($counter % 5) == 0) {
+						
+			# Update forced alerts
+			pandora_exec_forced_alerts ($pa_config, $dbh);
+		}
+		
+		# TASKS EXECUTED EVERY 30 SECONDS (Mid latency tasks)
+		# ---------------------------------------------------
+		if (($counter % 30) == 0) {
+
+			# Update module status and fired alert counts
+			my @agents = get_db_rows ($dbh, 'SELECT id_agente, nombre, update_module_count, update_alert_count FROM tagente WHERE disabled = 0 AND (update_module_count=1 OR update_alert_count=1)');
+			foreach my $agent (@agents) {
+				logger ($pa_config, "Updating module status and fired alert counts for agent " . $agent->{'nombre'}, 10);
+				
+				if ($agent->{'update_module_count'} == 1) {
+					pandora_update_agent_module_count ($dbh, $agent->{'id_agente'});
+				}
+				
+				if ($agent->{'update_alert_count'} == 1) {
+					pandora_update_agent_alert_count ($dbh, $agent->{'id_agente'});
+				}
+			}
+
+			# Keepalive module control.(very DB intensive, not run frecuently
+			pandora_module_keep_alive_nd ($pa_config, $dbh);
+			
+			# Set the status of unknown modules
+			pandora_module_unknown ($pa_config, $dbh);
+			
+			# Set event storm protection
+			pandora_set_event_storm_protection (pandora_get_tconfig_token ($dbh, 'event_storm_protection', 0));
+		}
+		
+		# TASKS EXECUTED EVERY 60 SECONDS (High latency tasks)
+		# ----------------------------------------------------
+		if (($counter % 60) == 0) {
+			# Downtimes are executed only 30 x Server Threshold secs
+			pandora_planned_downtime ($pa_config, $dbh);
+			
+			# Realtime stats (Only master server!) - ( VERY HEAVY !)
+			# Realtimestats == 1, generated by WEB Console, not by server!
+			if ($pa_config->{"pandora_master"} == 1 
+				&& defined($pa_config->{"realtimestats"}) 
+				&& $pa_config->{"realtimestats"} == 0){
+				
+				# Check if I need to refresh stats
+				my $last_execution_stats = get_db_value ($dbh, "SELECT MAX(utimestamp) FROM tgroup_stat");
+				if (!defined($last_execution_stats) || $last_execution_stats < (time() - $pa_config->{"stats_interval"})){
+					pandora_group_statistics ($pa_config, $dbh);
+					pandora_server_statistics ($pa_config, $dbh);
+				}
+			}
+			
+			# Pandora self monitoring
+			if (defined($pa_config->{"self_monitoring"}) 
+			&& $pa_config->{"self_monitoring"} == 1){
+				pandora_self_monitoring ($pa_config, $dbh);
+			}
+		}
+	
+		# Avoid counter overflow
+		if ($counter > 10000){
+			$counter = 0;
+		}
+		else {
+			$counter++;
+		}
+		
+		sleep (1);
+	}
+}
+
 $SIG{'TERM'} = 'pandora_shutdown';
 $SIG{'INT'} = 'pandora_shutdown';
 
@@ -259,18 +347,21 @@
 
 	if($Config{'policy_manager'} == 1) {
 		# Start thread to patrol policy queue
-		my $thr_policy_queue = threads->create('pandora_process_policy_queue', (\%Config));
+		threads->create('pandora_process_policy_queue', (\%Config))->detach();
 	}
 	
 	if($Config{'event_replication'} == 1) {
 		# Start thread to process event replication
-		my $thr_event_replication = threads->create('pandora_process_event_replication', (\%Config));
+		threads->create('pandora_process_event_replication', (\%Config))->detach();
 	}
 }
 
 # Start the servers
 pandora_startup ();
 
+# Start thread to execute server tasks
+threads->create('pandora_server_tasks', (\%Config))->detach();
+
 # Generate 'going up' events
 foreach my $server (@Servers) {
 	$server->upEvent ();
@@ -278,89 +369,19 @@
 
 # Main loop
 my $time_ref = time ();
-my $counter = 0;
-
 while (1) {
 	
 	eval {
 		
-		# TASKS DONE EACH 5 SECONDS (Low latency tasks)
-		# ---------------------------------------------
-		# Server status update each 5 seconds
-		# Neightbourhood problem detection each 5 seconds
-		# Forced alerts each 5 seconds as well
-		if (($counter % 5) == 0) {
-			
-			# Update server status
-			foreach my $server (@Servers) {
-				die ($server->getErrStr ()) unless ($server->checkThreads () == 1);
-				$server->update ();
-			}
-			
-			# Update fallen servers
-			db_do ($DBH, "UPDATE tserver SET status = 0 WHERE keepalive < ?", strftime ("%Y-%m-%d %H:%M:%S", localtime(time() - $Config{'keepalive'})));
-			
-			# Update forced alerts
-			pandora_exec_forced_alerts (\%Config, $DBH);
-			
+		# Update server status
+		foreach my $server (@Servers) {
+			die ($server->getErrStr ()) unless ($server->checkThreads () == 1);
+			$server->update();
 		}
-		
-		# TASKS DONE EACH 30 SECONDS (Med latency tasks)
-		# ---------------------------------------------
-		# Tasks executed only each Server Threshold x 30 secs, for low-priority tasks
-		if (($counter % 30) == 0) {
 
-			# Update module status and fired alert counts
-			my @agents = get_db_rows ($DBH, 'SELECT id_agente, nombre, update_module_count, update_alert_count FROM tagente WHERE disabled = 0 AND (update_module_count=1 OR update_alert_count=1)');
-			foreach my $agent (@agents) {
-				logger (\%Config, "Updating module status and alert fired counts for agent " . $agent->{'nombre'}, 10);
-				
-				if ($agent->{'update_module_count'} == 1) {
-					pandora_update_agent_module_count ($DBH, $agent->{'id_agente'});
-				}
-				
-				if ($agent->{'update_alert_count'} == 1) {
-					pandora_update_agent_alert_count ($DBH, $agent->{'id_agente'});
-				}
-
-			}
-
-			# Keepalive module control.(very DB intensive, not run frecuently
-			pandora_module_keep_alive_nd (\%Config, $DBH);
-			
-			# Set the status of unknown modules
-			pandora_module_unknown (\%Config, $DBH);
-			
-			# Set event storm protection
-			pandora_set_event_storm_protection (pandora_get_tconfig_token ($DBH, 'event_storm_protection', 0));
-		}
-		
-		# TASKS DONE EACH 60 SECONDS (Low latency tasks)
-		# ---------------------------------------------
-		if (($counter % 60) == 0) {
-			# Downtimes are executed only 30 x Server Threshold secs
-			pandora_planned_downtime (\%Config, $DBH);
-			
-			# Realtime stats (Only master server!) - ( VERY HEAVY !)
-			# Realtimestats == 1, generated by WEB Console, not by server!
-			if ($Config{"pandora_master"} == 1 
-				&& defined($Config{"realtimestats"}) 
-				&& $Config{"realtimestats"} == 0){
-				
-				# Check if I need to refresh stats
-				my $last_execution_stats = get_db_value ($DBH, "SELECT MAX(utimestamp) FROM tgroup_stat");
-				if (!defined($last_execution_stats) || $last_execution_stats < (time() - $Config{"stats_interval"})){
-					pandora_group_statistics (\%Config, $DBH);
-					pandora_server_statistics (\%Config, $DBH);
-				}
-			}
-			
-			# Pandora self monitoring
-			if (defined($Config{"self_monitoring"}) 
-			&& $Config{"self_monitoring"} == 1){
-				pandora_self_monitoring (\%Config, $DBH);
-			}
-		}
+		# Not needed. The console assumes a server is down if it has not updated its status in the last 15 minutes.
+		## Update fallen servers
+		#db_do ($DBH, "UPDATE tserver SET status = 0 WHERE keepalive < ?", strftime ("%Y-%m-%d %H:%M:%S", localtime(time() - $Config{'keepalive'})));			
 	};
 	
 	# Restart on error or auto restart
@@ -394,15 +415,6 @@
 		close (OLDOUT);
 	}
 	
-	# Avoid counter overflow
-	if ($counter > 10000){
-		$counter = 0;
-	}
-	else {
-		$counter++;
-	}
-	
 	threads->yield;
-	sleep (1);
-
+	sleep ($Config{'server_threshold'});
 }

Modified: trunk/pandora_server/lib/PandoraFMS/Server.pm
===================================================================
--- trunk/pandora_server/lib/PandoraFMS/Server.pm	2013-04-17 14:45:17 UTC (rev 8002)
+++ trunk/pandora_server/lib/PandoraFMS/Server.pm	2013-04-17 14:58:50 UTC (rev 8003)
@@ -215,6 +215,12 @@
 	
 	foreach my $tid (@{$self->{'_threads'}}) {
 		my $thr = threads->object ($tid);
+		
+		# May happen when the server is killed
+		if (! defined ($thr)) {
+			next;
+		}
+		
 		return 1 unless $thr->can ('is_running');
 		return 0 unless $thr->is_running ();
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8007
          http://pandora.svn.sourceforge.net/pandora/?rev=8007&view=rev
Author:   ramonn
Date:     2013-04-17 17:59:49 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
2013-04-17  Ramon Novoa  <rnovoa@...>

	* lib/PandoraFMS/DataServer.pm: Update the module interval. Fixes bug
	  #3610666.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/lib/PandoraFMS/DataServer.pm

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-04-17 16:18:34 UTC (rev 8006)
+++ trunk/pandora_server/ChangeLog	2013-04-17 17:59:49 UTC (rev 8007)
@@ -1,5 +1,10 @@
 2013-04-17  Ramon Novoa  <rnovoa@...>
 
+	* lib/PandoraFMS/DataServer.pm: Update the module interval. Fixes bug
+	  #3610666.
+
+2013-04-17  Ramon Novoa  <rnovoa@...>
+
 	* lib/PandoraFMS/Server.pm,
 	  bin/pandora_server: Moved server tasks to their own thread. Fixes
 	  bug #3609450.

Modified: trunk/pandora_server/lib/PandoraFMS/DataServer.pm
===================================================================
--- trunk/pandora_server/lib/PandoraFMS/DataServer.pm	2013-04-17 16:18:34 UTC (rev 8006)
+++ trunk/pandora_server/lib/PandoraFMS/DataServer.pm	2013-04-17 17:59:49 UTC (rev 8007)
@@ -547,6 +547,7 @@
 	$ModuleSem->down ();
 	my $module = get_db_single_row ($dbh, 'SELECT * FROM tagente_modulo WHERE id_agente = ? AND ' . db_text ('nombre') . ' = ?', $agent->{'id_agente'}, safe_input($module_name));
 	if (! defined ($module)) {
+		
 		# Do not auto create modules
 		if ($pa_config->{'autocreate'} ne '1') {
 			logger($pa_config, "Module '$module_name' not found for agent '$agent_name' and module auto-creation disabled.", 10);
@@ -619,6 +620,7 @@
 		# Set default values
 		$module_conf->{'descripcion'} = $module->{'descripcion'} unless defined ($module_conf->{'descripcion'});
 		$module_conf->{'extended_info'} = $module->{'extended_info'} unless defined ($module_conf->{'extended_info'});
+		$module_conf->{'module_interval'} = $module->{'module_interval'} unless defined ($module_conf->{'module_interval'});
 	}
 
 	# Update module configuration if in learning mode and not a policy module
@@ -702,13 +704,13 @@
 	my ($pa_config, $dbh, $module, $module_conf) = @_;
 
 	# Update if at least one of the configuration tokens has changed
-	foreach my $conf_token ('descripcion', 'extended_info') {
+	foreach my $conf_token ('descripcion', 'extended_info', 'module_interval') {
 		if ($module->{$conf_token} ne $module_conf->{$conf_token}) {
 			logger ($pa_config, "Updating configuration for module '" . safe_output($module->{'nombre'})	. "'.", 10);
 
-			db_do ($dbh, 'UPDATE tagente_modulo SET descripcion = ?, extended_info = ?
+			db_do ($dbh, 'UPDATE tagente_modulo SET descripcion = ?, extended_info = ?, module_interval = ?
 				WHERE id_agente_modulo = ?', $module_conf->{'descripcion'} eq '' ? $module->{'descripcion'} : $module_conf->{'descripcion'},
-				$module_conf->{'extended_info'}, $module->{'id_agente_modulo'});
+				$module_conf->{'extended_info'}, $module_conf->{'module_interval'}, $module->{'id_agente_modulo'});
 			last;
 		}
 	}
@@ -716,6 +718,7 @@
 	# Update module hash
 	$module->{'extended_info'} = $module_conf->{'extended_info'} if (defined($module_conf->{'extended_info'})) ;
 	$module->{'descripcion'} = ($module_conf->{'descripcion'} eq '') ? $module->{'descripcion'} : $module_conf->{'descripcion'};
+	$module->{'module_interval'} = ($module_conf->{'module_interval'} eq '') ? $module->{'module_interval'} : $module_conf->{'module_interval'};
 }
 
 1;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8011
          http://pandora.svn.sourceforge.net/pandora/?rev=8011&view=rev
Author:   mdtrooper
Date:     2013-04-18 15:19:35 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
2013-04-18 Miguel de Dios <miguel.dedios@...>

	* lib/PandoraFMS/Core.pm: cleaned source code style.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/lib/PandoraFMS/Core.pm

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-04-18 15:04:51 UTC (rev 8010)
+++ trunk/pandora_server/ChangeLog	2013-04-18 15:19:35 UTC (rev 8011)
@@ -1,3 +1,7 @@
+2013-04-18 Miguel de Dios <miguel.dedios@...>
+
+	* lib/PandoraFMS/Core.pm: cleaned source code style.
+
 2013-04-17  Ramon Novoa  <rnovoa@...>
 
 	* lib/PandoraFMS/DataServer.pm: Update the module interval. Fixes bug

Modified: trunk/pandora_server/lib/PandoraFMS/Core.pm
===================================================================
--- trunk/pandora_server/lib/PandoraFMS/Core.pm	2013-04-18 15:04:51 UTC (rev 8010)
+++ trunk/pandora_server/lib/PandoraFMS/Core.pm	2013-04-18 15:19:35 UTC (rev 8011)
@@ -2271,7 +2271,8 @@
 sub pandora_create_module_from_hash ($$$) {
 	my ($pa_config, $parameters, $dbh) = @_;
 	
-	logger($pa_config, "Creating module '$parameters->{'nombre'}' for agent ID $parameters->{'id_agente'}.", 10);
+	logger($pa_config,
+		"Creating module '$parameters->{'nombre'}' for agent ID $parameters->{'id_agente'}.", 10);
 	
 	# Delete tags that will not be stored in tagente_modulo
 	delete $parameters->{'data'};
@@ -2279,7 +2280,8 @@
 	delete $parameters->{'datalist'};
 	delete $parameters->{'status'};
 	
-	my $module_id = db_process_insert($dbh, 'id_agente_modulo', 'tagente_modulo', $parameters);
+	my $module_id = db_process_insert($dbh, 'id_agente_modulo',
+		'tagente_modulo', $parameters);
 	
 	my $status = 4;
 	if (defined ($parameters->{'id_tipo_modulo'}) && ($parameters->{'id_tipo_modulo'} == 21 || $parameters->{'id_tipo_modulo'} == 22 || $parameters->{'id_tipo_modulo'} == 23)) {
@@ -2436,7 +2438,7 @@
 ##########################################################################
 sub pandora_add_agent_address ($$$$$) {
 	my ($pa_config, $agent_id, $agent_name, $addr, $dbh) = @_;
-		
+	
 	# Add the new address if it does not exist
 	my $addr_id = get_addr_id ($dbh, $addr);
 	

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8014
          http://pandora.svn.sourceforge.net/pandora/?rev=8014&view=rev
Author:   slerena
Date:     2013-04-18 18:09:28 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
2013-04-18  Sancho Lerena <slerena@...>

        * util/pandora_db.pl: Added a usleep() inside loops to aliviate
        SQL transactions. This should help to improve performance and
        avoid lockings.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/util/pandora_db.pl

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-04-18 18:06:48 UTC (rev 8013)
+++ trunk/pandora_server/ChangeLog	2013-04-18 18:09:28 UTC (rev 8014)
@@ -1,3 +1,9 @@
+2013-04-18  Sancho Lerena <slerena@...>
+
+        * util/pandora_db.pl: Added a usleep() inside loops to aliviate
+        SQL transactions. This should help to improve performance and
+        avoid lockings.
+
 2013-04-18 Miguel de Dios <miguel.dedios@...>
 
 	* lib/PandoraFMS/Core.pm: cleaned source code style.

Modified: trunk/pandora_server/util/pandora_db.pl
===================================================================
--- trunk/pandora_server/util/pandora_db.pl	2013-04-18 18:06:48 UTC (rev 8013)
+++ trunk/pandora_server/util/pandora_db.pl	2013-04-18 18:09:28 UTC (rev 8014)
@@ -3,7 +3,7 @@
 ###############################################################################
 # Pandora FMS DB Management
 ###############################################################################
-# Copyright (c) 2005-2012 Artica Soluciones Tecnologicas S.L
+# Copyright (c) 2005-2013 Artica Soluciones Tecnologicas S.L
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -23,6 +23,7 @@
 use DBI;				# DB interface with MySQL
 use POSIX qw(strftime);
 use File::Path qw (rmtree);
+use Time::HiRes qw/usleep/;
 
 # Default lib dir for RPM and DEB packages
 use lib '/usr/lib/perl5';
@@ -31,7 +32,7 @@
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "5.0dev PS130228";
+my $version = "5.0dev PS130418";
 
 # Pandora server configuration
 my %conf;
@@ -105,6 +106,9 @@
 		for (my $ax = 1; $ax <= $BIG_OPERATION_STEP; $ax++){
 			db_do ($dbh, "DELETE FROM tagente_datos WHERE utimestamp < ". ($first_mark + ($purge_steps * $ax)) . " AND utimestamp >= ". $first_mark );
 			print "[PURGE] Data deletion Progress %$ax .. \r";
+
+			# Do a nanosleep here for 0,01 sec
+			usleep (10000);
 		}
 	    print "\n";
 	} else {
@@ -138,6 +142,8 @@
 		    for (my $ax = 1; $ax <= $BIG_OPERATION_STEP; $ax++){
 			    db_do ($dbh, "DELETE FROM tagente_datos_inventory WHERE utimestamp < ". ($first_mark + ($purge_steps * $ax)) . " AND utimestamp >= ". $first_mark );
 			    print "[PURGE] Inventory data deletion Progress %$ax .. \r";
+			    # Do a nanosleep here for 0,01 sec
+				usleep (10000);
 		    }
 	        print "\n";
 	    } else {
@@ -157,6 +163,8 @@
 		for (my $ax = 1; $ax <= $BIG_OPERATION_STEP; $ax++){
 			db_do ($dbh, "DELETE FROM tagente_datos_log4x WHERE utimestamp < ". ($first_mark + ($purge_steps * $ax)) . " AND utimestamp >= ". $first_mark );
 			print "[PURGE] Log4x data deletion progress %$ax .. \r";
+			# Do a nanosleep here for 0,01 sec
+			usleep (10000);
 		}
 		print "\n";
 	} else {
@@ -302,6 +310,8 @@
 		for (my $ax = 1; $ax <= $BIG_OPERATION_STEP; $ax++){ 
 			db_do ($dbh, "DELETE FROM tagent_access WHERE utimestamp < ". ( $first_mark + ($purge_steps * $ax)) . " AND utimestamp >= ". $first_mark);
 			print "[PURGE] Agent access deletion progress %$ax .. \r";
+			# Do a nanosleep here for 0,01 sec
+			usleep (10000);
 		}
 	    print "\n";
 	} else {
@@ -471,6 +481,7 @@
 				delete($count_hash{$key});
 			}
 
+			usleep (1000); # Very small usleep, just to don't burn the DB
 			# Move to the next interval
 			$start_utime = $stop_utime;
 	}
@@ -587,6 +598,9 @@
     # Delete all non-used IP addresses from taddress
     db_do ($dbh, 'DELETE FROM taddress WHERE id_a NOT IN (SELECT id_a FROM taddress_agent)');
 
+	# Do a nanosleep here for 0,01 sec
+	usleep (10000);
+
     print "[INTEGRITY] Deleting orphan alerts \n";
 
     # Delete alerts assigned to inexistant modules
@@ -602,10 +616,7 @@
 
     # Delete orphan data_inc reference records
     db_do ($dbh, 'DELETE FROM tagente_datos_inc WHERE id_agente_modulo NOT IN (SELECT id_agente_modulo FROM tagente_modulo)');
-    
-    # Delete all non-used IP addresses from taddress
-    db_do ($dbh, 'DELETE FROM taddress WHERE id_a NOT IN (SELECT id_a FROM taddress_agent)');
-    
+       
     # Check enterprise tables
     enterprise_hook ('pandora_checkdb_integrity_enterprise', [$dbh]);
 }
@@ -638,6 +649,9 @@
 		# Delete the module
 		db_do ($dbh, 'DELETE FROM tagente_modulo WHERE id_agente_modulo = ?', $id_agente_modulo);
 
+		# Do a nanosleep here for 0,001 sec
+		usleep (100000);
+
 		# Delete any alerts associated to the module
 		db_do ($dbh, 'DELETE FROM talert_template_modules WHERE id_agent_module = ?', $id_agente_modulo);
 	}
@@ -657,6 +671,9 @@
 			
 			# Delete any alerts associated to the module
 			db_do ($dbh, 'DELETE FROM talert_template_modules WHERE id_agent_module = ? AND NOT EXISTS (SELECT id_agente_modulo FROM tagente_modulo WHERE id_agente_modulo = ?)', $id_agente_modulo, $id_agente_modulo);
+
+			# Do a nanosleep here for 0,001 sec
+			usleep (100000);
 		}
 	}
 	print "[CHECKDB] Checking database consistency (Missing status)... \n";
@@ -686,6 +703,10 @@
 		next if (defined ($count) && $count > 0);
 	
 		db_do ($dbh, 'DELETE FROM tagente_estado WHERE id_agente_modulo = ?', $id_agente_modulo);
+
+		# Do a nanosleep here for 0,001 sec
+		usleep (100000);
+
 		print "[CHECKDB] Deleting non-existing module $id_agente_modulo in state table \n";
 	}
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8022
          http://pandora.svn.sourceforge.net/pandora/?rev=8022&view=rev
Author:   junichi-satoh
Date:     2013-04-21 01:22:03 +0000 (Sun, 21 Apr 2013)
Log Message:
-----------
2013-04-21  Junichi Satoh <junichi@...>

	* FreeBSD/pandora_server.conf, NetBSD/pandora_server.conf: Updated
	default settings as the same as Linux ones.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/FreeBSD/pandora_server.conf
    trunk/pandora_server/NetBSD/pandora_server.conf

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-04-21 00:36:33 UTC (rev 8021)
+++ trunk/pandora_server/ChangeLog	2013-04-21 01:22:03 UTC (rev 8022)
@@ -1,3 +1,8 @@
+2013-04-21  Junichi Satoh <junichi@...>
+
+	* FreeBSD/pandora_server.conf, NetBSD/pandora_server.conf: Updated
+	default settings as the same as Linux ones.
+
 2013-04-18  Sancho Lerena <slerena@...>
 
         * util/pandora_db.pl: Added a usleep() inside loops to aliviate

Modified: trunk/pandora_server/FreeBSD/pandora_server.conf
===================================================================
--- trunk/pandora_server/FreeBSD/pandora_server.conf	2013-04-21 00:36:33 UTC (rev 8021)
+++ trunk/pandora_server/FreeBSD/pandora_server.conf	2013-04-21 01:22:03 UTC (rev 8022)
@@ -1,9 +1,9 @@
 #############################################################################
 # Pandora FMS Server Parameters
 # Pandora FMS, the Flexible Monitoring System.
-# Version 4.0
+# Version 130420
 # Licensed under GPL license v2,
-# (c) 2003-2011 Artica Soluciones Tecnologicas
+# (c) 2003-2013 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
 # Please change it for your setup needs
 #############################################################################
@@ -39,14 +39,15 @@
 # daemon 1
 
 # dbengine: mysql, postgresql or oracle (mysql by default)
-#dbengine mysql
 
+dbengine mysql
+
 # Database credentials. A VERY important configuration.
 # This must be the same credentials used by your Pandora FMS Console
 # but could be different if your console is not running in the same
 # host than the server. Check your console setup in /include/config.php
 
-# dbname: Database name (pandora by default
+# dbname: Database name (pandora by default)
 
 dbname pandora
 
@@ -68,6 +69,7 @@
 #dbport 3306
 
 # By default, parent agent will not update
+
 #update_parent 0
 
 # verbosity: level of detail on errors/messages (0 default, 1 verbose, 2 debug.... 10 noisy)
@@ -81,14 +83,15 @@
 master 1
 
 # Activate Pandora SNMP console (depending on snmptrapd)
-# only available on Pandora Network server
 
-snmpconsole 1
+snmpconsole 0
 
 # snmptrapd will ignore authenticationFailure traps if set to 1.
+
 snmp_ignore_authfailure 1
 
 # snmptrapd will read the PDU source address instead of the agent-addr field is set to 1.
+
 snmp_pdu_address 0
 
 # Activate (1) Pandora Network Server 
@@ -104,19 +107,21 @@
 reconserver 1
 
 # pluginserver : 1 or 0. Set to 1 to activate plugin server with this setup
-# DISABLED BY DEFAULT
-pluginserver 0 
 
+pluginserver 1 
+
 # Pandora FMS Plugin exec tool filepath (by default at /usr/local/bin)
 
 plugin_exec /usr/local/bin/gtimeout
 
 # predictionserver : 1 or 0. Set to 1 to activate prediction server with this setup
 # DISABLED BY DEFAULT 
+
 predictionserver 0
 
 # wmiserver : 1 or 0. Set to 1 to activate WMI server with this setup
 # DISABLED BY DEFAULT
+
 wmiserver 0
 
 # wmic: Needed by Pandora FMS wmi server.
@@ -137,7 +142,7 @@
 
 # Network threads: Do not set too high (~40). Each threads make a network module check.
 
-network_threads 4
+network_threads 3
 
 # icmp_checks x : defines number of pings for each icmp_proc module type. at least one of 
 # that ping should be 1 to report 1
@@ -165,7 +170,7 @@
 
 # plugin_threads: Specify number of plugin server threads for processing plugin calls
 
-plugin_threads 2
+plugin_threads 1
 
 # plugin_timeout: Specify number of seconds calling plugin exec waiting for response
 # after this time, call is aborted and result is "unknown".
@@ -178,35 +183,39 @@
 
 # wmi_threads: Specify number of WMI server threads for processing WMI remote calls
 
-wmi_threads 2
+wmi_threads 1
 
 # recon_threads. Each thread will scan a different scantask.
 
-recon_threads 2
+recon_threads 1
 
 # dataserver_threads: Number of threads for data server (XML processing threads)
 
-dataserver_threads 2
+dataserver_threads 1
 
 # mta_address: External Mailer (MTA) IP Address to be used by Pandora FMS internal email capabilities
-#mta_address 192.168.50.1
 
 mta_address localhost
 
-# mta_port: MTA port (default 25)
+# mta_port, this is the mail server port (default 25)
+
 #mta_port 25
 
 # mta_user MTA User (if needed for auth, FQD or simple user, depending on your server)
+
 #mta_user myuser@...
 
 # mta_pass MTA Pass (if needed for auth)
+
 #mta_pass mypassword
 
-# mta_auth MTA Auth system (if needed, support: LOGIN, PLAIN, CRAM-MD5, DIGEST-MD)
+# mta_auth MTA Auth system (if needed, it supports LOGIN, PLAIN, CRAM-MD5, DIGEST-MD)
+
 #mta_auth LOGIN
 
 # mta_from Email address that sends the mail, by default is pandora@... 
 #           probably you need to change it to avoid problems with your antispam
+
 #mta_from Pandora FMS <pandora@...>
 
 # xprobe2: Optional package to detect OS types using advanced TCP/IP 
@@ -230,9 +239,15 @@
 snmp_trapd /usr/local/sbin/snmptrapd
 
 # Location of the braa binary needed by the Enterprise SNMP Server (/usr/local/bin/braa by default) (PANDORA FMS ENTERPRISE ONLY).
+
 braa /usr/local/bin/braa
 
+# Number of retries before braa hands a module over to the Network Server (PANDORA FMS ENTERPRISE ONLY).
+
+braa_retries 3
+
 # Default group id for new agents created with Pandora FMS Data Server
+
 autocreate_group 2
 
 # Set to 1 if want to autocreate agents with Pandora FMS Data Server, 
@@ -267,9 +282,11 @@
 # More information about GIS Setup in /usr/share/pandora_server/util/gis.README
 # Flag to activate GIS (positional information for agents and maps) 
 # by default it is desactivated
+
 #activate_gis 0
 
 # Radius of error in meters to consider two gis locations as the same location.
+
 #location_error 50
 
 # Recon reverse geolocation mode [disabled, sql, file]
@@ -284,6 +301,7 @@
 
 # Recon reverse geolocation file. This is the database with the reverse 
 # geolocation information using MaxMind GPL GeoLiteCity.dat format).
+
 #recon_reverse_geolocation_file /usr/local/share/GeoIP/GeoIPCity.dat
 
 # Radius (in meters) of the circle in where the agents will be place randomly 
@@ -291,10 +309,12 @@
 # by geolocating the IP.
 #recon_location_scatter_radius 1000
 
-# Pandora Server self-monitoring (embedded agent) (by default disabled)
-#self_monitoring 1
+# Pandora Server self-monitoring (embedded agent) (by default enabled)
 
+self_monitoring 1
+
 # Update parent from the agent xml
+
 #update_parent 1
 #
 #
@@ -313,53 +333,87 @@
 # openstreetmaps_description 1
 
 # Enable (1) or disable (0) Pandora FMS Event Web Server (PANDORA FMS ENTERPRISE ONLY).
+
 webserver 1
 
 # Number of threads for the Web Server (PANDORA FMS ENTERPRISE ONLY).
+
 web_threads 1
 
 # Enable (1) or disable (0) Pandora FMS Inventory Server (PANDORA FMS ENTERPRISE ONLY).
+
 inventoryserver 1
 
 # Number of threads for the Web Server (PANDORA FMS ENTERPRISE ONLY).
+
 inventory_threads 1
 
 # Enable (1) or disable (0) Pandora FMS Export Server (PANDORA FMS ENTERPRISE ONLY).
-exportserver 1
 
+exportserver 0
+
 # Number of threads for the Export Server (PANDORA FMS ENTERPRISE ONLY).
+
 export_threads 1
 
 # Enable (1) or disable (0) Pandora FMS Event Server (PANDORA FMS ENTERPRISE ONLY).
-eventserver 1
 
+eventserver 0
+
 # Event Server event window in seconds (3600 by default) (PANDORA FMS ENTERPRISE ONLY).
+
 event_window 3600
 
 # Enable (1) or disable (0) Pandora FMS Enterprise ICMP Server (PANDORA FMS ENTERPRISE ONLY).
-icmpserver 1
+# You need nmap 5.20 or higher in order to use this !
 
+icmpserver 0
+
 # Number of threads for the Enterprise ICMP Server (PANDORA FMS ENTERPRISE ONLY).
+
 icmp_threads 2
 
 # Enable (1) or disable (0) Pandora FMS Enterprise SNMP Server (PANDORA FMS ENTERPRISE ONLY).
+# Check braa tool is running and operative.
+
 snmpserver 0
 
 # Number of threads for the Enterprise SNMP Server (PANDORA FMS ENTERPRISE ONLY).
+
 snmp_threads 2
 
 # Block size for block producer/consumer servers, that is, the number of modules
 # per block (15 by default) (PANDORA FMS ENTERPRISE ONLY).
+
 block_size 15
 
-# Enable (1) or disable (0) Pandora FMS Netflow Server (PANDORA FMS ENTERPRISE ONLY).
-netflowserver 0
+# Enable (1) or disable (0) Pandora FMS Netflow Server.
+# You need to install package nfcapd before try to use this feature.
 
+netflowserver 1
+
 # Path to the netflow daemon nfcapd.
+
 netflow_daemon /usr/local/bin/nfcapd
 
-# Netflow file rotation interval in seconds.
-netflow_interval 300
+# If set to 1, process XML data files in a stack instead of a queue. 0 by default.
+# WARNING: Incremental modules will not work properly if dataserver_lifo is set to 1!!!
 
-# Base directory where netflow files will be stored.
-netflow_basedir /tmp
+dataserver_lifo 0
+
+# If set to 1, the policy manager is enabled and the server is listening the policy queue. 
+# 0 by default (PANDORA FMS ENTERPRISE ONLY) 
+
+policy_manager 0
+
+# If set to 1, the event replicate process is enabled. 0 by default. (PANDORA FMS ENTERPRISE ONLY) 
+# WARNING: This process doesn't do anything if is not properly configured from the console setup 
+
+event_replication 0
+
+# If set to 1, new events validate older event for the same module. This will
+# affect the performance of the server. This was the "normal behaviour" on previous (4.x) versions.
+# disable only if you really know what you are doing !!.
+
+event_auto_validation 1
+

Modified: trunk/pandora_server/NetBSD/pandora_server.conf
===================================================================
--- trunk/pandora_server/NetBSD/pandora_server.conf	2013-04-21 00:36:33 UTC (rev 8021)
+++ trunk/pandora_server/NetBSD/pandora_server.conf	2013-04-21 01:22:03 UTC (rev 8022)
@@ -1,9 +1,9 @@
 #############################################################################
 # Pandora FMS Server Parameters
 # Pandora FMS, the Flexible Monitoring System.
-# Version 4.0
+# Version 130420
 # Licensed under GPL license v2,
-# (c) 2003-2011 Artica Soluciones Tecnologicas
+# (c) 2003-2013 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
 # Please change it for your setup needs
 #############################################################################
@@ -39,14 +39,15 @@
 # daemon 1
 
 # dbengine: mysql, postgresql or oracle (mysql by default)
-#dbengine mysql
 
+dbengine mysql
+
 # Database credentials. A VERY important configuration.
 # This must be the same credentials used by your Pandora FMS Console
 # but could be different if your console is not running in the same
 # host than the server. Check your console setup in /include/config.php
 
-# dbname: Database name (pandora by default
+# dbname: Database name (pandora by default)
 
 dbname pandora
 
@@ -81,10 +82,17 @@
 master 1
 
 # Activate Pandora SNMP console (depending on snmptrapd)
-# only available on Pandora Network server
 
-snmpconsole 1
+snmpconsole 0
 
+# snmptrapd will ignore authenticationFailure traps if set to 1.
+
+snmp_ignore_authfailure 1
+
+# snmptrapd will read the PDU source address instead of the agent-addr field is set to 1.
+
+snmp_pdu_address 0
+
 # Activate (1) Pandora Network Server 
 
 networkserver 1
@@ -106,10 +114,12 @@
 
 # predictionserver : 1 or 0. Set to 1 to activate prediction server with this setup
 # DISABLED BY DEFAULT 
+
 predictionserver 0
 
 # wmiserver : 1 or 0. Set to 1 to activate WMI server with this setup
 # DISABLED BY DEFAULT
+
 wmiserver 0
 
 # wmic: Needed by Pandora FMS wmi server.
@@ -118,7 +128,7 @@
 
 # Network timeout (in seconds) for timeout in network connections for Network agents
 
-network_timeout 4
+network_timeout 5
 
 # Server keepalive (in seconds)
 
@@ -130,7 +140,7 @@
 
 # Network threads: Do not set too high (~40). Each threads make a network module check.
 
-network_threads 4
+network_threads 3
 
 # icmp_checks x : defines number of pings for each icmp_proc module type. at least one of 
 # that ping should be 1 to report 1
@@ -171,35 +181,39 @@
 
 # wmi_threads: Specify number of WMI server threads for processing WMI remote calls
 
-wmi_threads 2
+wmi_threads 1
 
 # recon_threads. Each thread will scan a different scantask.
 
-recon_threads 2
+recon_threads 1
 
 # dataserver_threads: Number of threads for data server (XML processing threads)
 
 dataserver_threads 1
 
 # mta_address: External Mailer (MTA) IP Address to be used by Pandora FMS internal email capabilities
-#mta_address 192.168.50.1
 
 mta_address localhost
 
-# mta_port: MTA port (default 25)
+# mta_port, this is the mail server port (default 25)
+
 #mta_port 25
 
 # mta_user MTA User (if needed for auth, FQD or simple user, depending on your server)
+
 #mta_user myuser@...
 
 # mta_pass MTA Pass (if needed for auth)
+
 #mta_pass mypassword
 
-# mta_auth MTA Auth system (if needed, support: LOGIN, PLAIN, CRAM-MD5, DIGEST-MD)
+# mta_auth MTA Auth system (if needed, it supports LOGIN, PLAIN, CRAM-MD5, DIGEST-MD)
+
 #mta_auth LOGIN
 
 # mta_from Email address that sends the mail, by default is pandora@... 
 #           probably you need to change it to avoid problems with your antispam
+
 #mta_from Pandora FMS <pandora@...>
 
 # xprobe2: Optional package to detect OS types using advanced TCP/IP 
@@ -223,9 +237,15 @@
 snmp_trapd /usr/opkg/sbin/snmptrapd
 
 # Location of the braa binary needed by the Enterprise SNMP Server (/usr/local/bin/braa by default) (PANDORA FMS ENTERPRISE ONLY).
+
 braa /usr/local/bin/braa
 
+# Number of retries before braa hands a module over to the Network Server (PANDORA FMS ENTERPRISE ONLY).
+
+braa_retries 3
+
 # Default group id for new agents created with Pandora FMS Data Server
+
 autocreate_group 2
 
 # Set to 1 if want to autocreate agents with Pandora FMS Data Server, 
@@ -245,6 +265,7 @@
 max_queue_files 500
 
 # Use the XML file last modification time as timestamp.
+
 # use_xml_timestamp 1
 
 # Pandora FMS will autorestart itself each XXX seconds, use this if you experience problems with 
@@ -260,9 +281,11 @@
 # More information about GIS Setup in /usr/share/pandora_server/util/gis.README
 # Flag to activate GIS (positional information for agents and maps) 
 # by default it is desactivated
+
 #activate_gis 0
 
 # Radius of error in meters to consider two gis locations as the same location.
+
 #location_error 50
 
 # Recon reverse geolocation mode [disabled, sql, file]
@@ -277,17 +300,21 @@
 
 # Recon reverse geolocation file. This is the database with the reverse 
 # geolocation information using MaxMind GPL GeoLiteCity.dat format).
+
 #recon_reverse_geolocation_file /usr/local/share/GeoIP/GeoIPCity.dat
 
 # Radius (in meters) of the circle in where the agents will be place randomly 
 # when finded by a recon task. Center of the circle is guessed 
 # by geolocating the IP.
+
 #recon_location_scatter_radius 1000
 
-# Pandora Server self-monitoring (embedded agent) (by default disabled)
-#self_monitoring 1
+# Pandora Server self-monitoring (embedded agent) (by default enabled)
 
+self_monitoring 1
+
 # Update parent from the agent xml
+
 #update_parent 1
 #
 #
@@ -306,41 +333,82 @@
 # openstreetmaps_description 1
 
 # Enable (1) or disable (0) Pandora FMS Event Web Server (PANDORA FMS ENTERPRISE ONLY).
+
 webserver 1
 
 # Number of threads for the Web Server (PANDORA FMS ENTERPRISE ONLY).
+
 web_threads 1
 
 # Enable (1) or disable (0) Pandora FMS Inventory Server (PANDORA FMS ENTERPRISE ONLY).
+
 inventoryserver 1
 
 # Number of threads for the Web Server (PANDORA FMS ENTERPRISE ONLY).
+
 inventory_threads 1
 
 # Enable (1) or disable (0) Pandora FMS Export Server (PANDORA FMS ENTERPRISE ONLY).
+
 exportserver 0
 
 # Number of threads for the Export Server (PANDORA FMS ENTERPRISE ONLY).
+
 export_threads 1
 
 # Enable (1) or disable (0) Pandora FMS Event Server (PANDORA FMS ENTERPRISE ONLY).
-eventserver 1
+eventserver 0
 
 # Event Server event window in seconds (3600 by default) (PANDORA FMS ENTERPRISE ONLY).
+
 event_window 3600
 
 # Enable (1) or disable (0) Pandora FMS Enterprise ICMP Server (PANDORA FMS ENTERPRISE ONLY).
-icmpserver 1
+# You need nmap 5.20 or higher in order to use this !
 
+icmpserver 0
+
 # Number of threads for the Enterprise ICMP Server (PANDORA FMS ENTERPRISE ONLY).
+
 icmp_threads 2
 
 # Enable (1) or disable (0) Pandora FMS Enterprise SNMP Server (PANDORA FMS ENTERPRISE ONLY).
+# Check braa tool is running and operative.
+
 snmpserver 0
 
 # Number of threads for the Enterprise SNMP Server (PANDORA FMS ENTERPRISE ONLY).
+
 snmp_threads 2
 
 # Block size for block producer/consumer servers, that is, the number of modules
-# per block (25 by default) (PANDORA FMS ENTERPRISE ONLY).
-block_size 25
+# per block (15 by default) (PANDORA FMS ENTERPRISE ONLY).
+
+block_size 15
+
+# Enable (1) or disable (0) Pandora FMS Netflow Server.
+# You need to install package nfcapd before try to use this feature.
+
+netflowserver 1
+
+# If set to 1, process XML data files in a stack instead of a queue. 0 by default.
+# WARNING: Incremental modules will not work properly if dataserver_lifo is set to 1!!!
+
+dataserver_lifo 0
+
+# If set to 1, the policy manager is enabled and the server is listening the policy queue. 
+# 0 by default (PANDORA FMS ENTERPRISE ONLY) 
+
+policy_manager 0
+
+# If set to 1, the event replicate process is enabled. 0 by default. (PANDORA FMS ENTERPRISE ONLY) 
+# WARNING: This process doesn't do anything if is not properly configured from the console setup 
+
+event_replication 0
+
+# If set to 1, new events validate older event for the same module. This will
+# affect the performance of the server. This was the "normal behaviour" on previous (4.x) versions.
+# disable only if you really know what you are doing !!.
+
+event_auto_validation 1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8040
          http://pandora.svn.sourceforge.net/pandora/?rev=8040&view=rev
Author:   slerena
Date:     2013-04-24 01:12:50 +0000 (Wed, 24 Apr 2013)
Log Message:
-----------
2013-04-24  Sancho Lerena <slerena@...>

        * util/pandora_db.pl: patched the code of tagente_datos purge to have n chunks, 
        and in each chunk run a DELETE of only 1000 records at a time (with a LIMIT), 
        adding a 0,0001 second usleep() there, gives time to MySQL to put other 
        operations between, and locks doesn't appear to be a problem anymore. This
        should solve many problems detected in the past.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/util/pandora_db.pl

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-04-24 00:53:39 UTC (rev 8039)
+++ trunk/pandora_server/ChangeLog	2013-04-24 01:12:50 UTC (rev 8040)
@@ -1,3 +1,11 @@
+2013-04-24  Sancho Lerena <slerena@...>
+
+        * util/pandora_db.pl: patched the code of tagente_datos purge to have n chunks, 
+        and in each chunk run a DELETE of only 1000 records at a time (with a LIMIT), 
+        adding a 0,0001 second usleep() there, gives time to MySQL to put other 
+        operations between, and locks doesn't appear to be a problem anymore. This
+        should solve many problems detected in the past.
+
 2013-04-21  Junichi Satoh <junichi@...>
 
 	* FreeBSD/pandora_server.conf, NetBSD/pandora_server.conf: Updated

Modified: trunk/pandora_server/util/pandora_db.pl
===================================================================
--- trunk/pandora_server/util/pandora_db.pl	2013-04-24 00:53:39 UTC (rev 8039)
+++ trunk/pandora_server/util/pandora_db.pl	2013-04-24 01:12:50 UTC (rev 8040)
@@ -38,10 +38,11 @@
 my %conf;
 
 my $BIG_OPERATION_STEP = 100; # Long operations are divided in XX steps for performance
+my $SMALL_OPERATION_STEP = 1000; # Each long operations has a LIMIT of SMALL_OPERATION_STEP to avoid locks. 
+                                 #Increate to 3000~5000 in fast systems decrease to 500 or 250 on systems with locks
+# FLUSH in each IO 
+$| = 1;
 
-# FLUSH in each IO
-$| = 0;
-
 # Init
 pandora_init(\%conf);
 
@@ -89,28 +90,45 @@
 	my $first_mark;
 	my $total_time;
 	my $purge_steps;
+	my $purge_count;
 
-    # Numeric data deletion
+	my $mark1;
+	my $mark2;
 
+        # Numeric data deletion
+
 	print "[PURGE] Deleting old data... \n";
-	
+
 	# This could be very timing consuming, so make this operation in $BIG_OPERATION_STEP 
 	# steps (100 fixed by default)
 	# Starting from the oldest record on the table
-	
+
+	# WARNING. This code is EXTREMELLY important. This block (data deletion) could KILL a database if 
+	# you alter code and you don't know exactly what are you doing. Please take in mind this code executes each hour
+	# and has been patches MANY times. Before altering anything, think twice !
+
 	$first_mark =  get_db_value ($dbh, 'SELECT utimestamp FROM tagente_datos ORDER BY utimestamp ASC LIMIT 1');
 	if (defined ($first_mark)) {
 		$total_time = $ulimit_timestamp - $first_mark;
 		$purge_steps = int($total_time / $BIG_OPERATION_STEP);
-	
+			
 		for (my $ax = 1; $ax <= $BIG_OPERATION_STEP; $ax++){
-			db_do ($dbh, "DELETE FROM tagente_datos WHERE utimestamp < ". ($first_mark + ($purge_steps * $ax)) . " AND utimestamp >= ". $first_mark );
-			print "[PURGE] Data deletion Progress %$ax .. \r";
 
-			# Do a nanosleep here for 0,01 sec
-			usleep (10000);
+			$mark1 = $first_mark + ($purge_steps * $ax);
+			$mark2 = $first_mark + ($purge_steps * ($ax -1));	
+		
+			# Let's split the intervals in $SMALL_OPERATION_STEP deletes each
+			$purge_count = get_db_value ($dbh, "SELECT COUNT(id_agente_modulo) FROM tagente_datos WHERE utimestamp < $mark1 AND utimestamp > $mark2");
+			while ($purge_count > 0){
+				print ".";
+				db_do ($dbh, "DELETE FROM tagente_datos WHERE utimestamp < $mark1 AND utimestamp > $mark2 LIMIT $SMALL_OPERATION_STEP");
+				# Do a nanosleep here for 0,001 sec
+                        	usleep (10000);
+				$purge_count = $purge_count - $SMALL_OPERATION_STEP;
+			}
+			print "\n[PURGE] Data deletion Progress (".$ax."%) ";
 		}
-	    print "\n";
+		print "\n";
 	} else {
 		print "[PURGE] No data in tagente_datos\n";
 	}
@@ -593,14 +611,12 @@
     # Delete all records on tgroup_stats
     db_do ($dbh, 'DELETE FROM tgroup_stat');
 
-    print "[INTEGRITY] Deleting non-used IP addresses \n";
-
+	
+    #print "[INTEGRITY] Deleting non-used IP addresses \n";
+    # DISABLED - Takes too much time and benefits of this are unclear....
     # Delete all non-used IP addresses from taddress
-    db_do ($dbh, 'DELETE FROM taddress WHERE id_a NOT IN (SELECT id_a FROM taddress_agent)');
+    #db_do ($dbh, 'DELETE FROM taddress WHERE id_a NOT IN (SELECT id_a FROM taddress_agent)');
 
-	# Do a nanosleep here for 0,01 sec
-	usleep (10000);
-
     print "[INTEGRITY] Deleting orphan alerts \n";
 
     # Delete alerts assigned to inexistant modules
@@ -616,7 +632,7 @@
 
     # Delete orphan data_inc reference records
     db_do ($dbh, 'DELETE FROM tagente_datos_inc WHERE id_agente_modulo NOT IN (SELECT id_agente_modulo FROM tagente_modulo)');
-       
+    
     # Check enterprise tables
     enterprise_hook ('pandora_checkdb_integrity_enterprise', [$dbh]);
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8067
          http://pandora.svn.sourceforge.net/pandora/?rev=8067&view=rev
Author:   ramonn
Date:     2013-04-26 11:26:28 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
2013-04-26  Ramon Novoa  <rnovoa@...>

	* lib/PandoraFMS/Core.pm: Adjusted module counts.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/lib/PandoraFMS/Core.pm

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-04-26 09:58:27 UTC (rev 8066)
+++ trunk/pandora_server/ChangeLog	2013-04-26 11:26:28 UTC (rev 8067)
@@ -1,3 +1,7 @@
+2013-04-26  Ramon Novoa  <rnovoa@...>
+
+	* lib/PandoraFMS/Core.pm: Adjusted module counts.
+
 2013-04-24  Sancho Lerena <slerena@...>
 
         * util/pandora_db.pl: patched the code of tagente_datos purge to have n chunks, 

Modified: trunk/pandora_server/lib/PandoraFMS/Core.pm
===================================================================
--- trunk/pandora_server/lib/PandoraFMS/Core.pm	2013-04-26 09:58:27 UTC (rev 8066)
+++ trunk/pandora_server/lib/PandoraFMS/Core.pm	2013-04-26 11:26:28 UTC (rev 8067)
@@ -2176,13 +2176,8 @@
 		VALUES (?, ?, ?, ?, ?, ?, ?, ?, 1)', $agent_id, $module_type_id, safe_input($module_name), $max, $min, $post_process, $description, $interval);
 	db_do ($dbh, 'INSERT INTO tagente_estado (id_agente_modulo, id_agente, estado, last_status, last_known_status, last_try) VALUES (?, ?, ?, ?, ?, \'1970-01-01 00:00:00\')', $module_id, $agent_id, $status, $status, $status);
 	
-	# Update the module status count
-	if ($status == 4) {
-		db_do ($dbh, 'UPDATE tagente SET total_count=total_count+1, notinit_count=notinit_count+1 WHERE id_agente=?', $agent_id);
-	}
-	else {
-		db_do ($dbh, 'UPDATE tagente SET total_count=total_count+1, normal_count=normal_count+1 WHERE id_agente=?', $agent_id);
-	}
+	# Update the module status count. When the module is created disabled dont do it
+	pandora_mark_agent_for_module_update ($dbh, $agent_id);
 	
 	return $module_id;
 }
@@ -3936,12 +3931,12 @@
 	my ($dbh, $agent_id) = @_;
 	
 	db_do ($dbh, 'UPDATE tagente SET update_module_count=0,
-	normal_count=(SELECT COUNT(*) FROM tagente_modulo, tagente_estado WHERE tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=' . $agent_id . ' AND estado=0),
-	critical_count=(SELECT COUNT(*) FROM tagente_modulo, tagente_estado WHERE tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=' . $agent_id . ' AND estado=1),
-	warning_count=(SELECT COUNT(*) FROM tagente_modulo, tagente_estado WHERE tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=' . $agent_id . ' AND estado=2),
-	unknown_count=(SELECT COUNT(*) FROM tagente_modulo, tagente_estado WHERE tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=' . $agent_id . ' AND estado=3),
-	notinit_count=(SELECT COUNT(*) FROM tagente_modulo, tagente_estado WHERE tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=' . $agent_id . ' AND estado=4),
-	total_count=(SELECT COUNT(*) FROM tagente_modulo, tagente_estado WHERE tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=' . $agent_id .
+	normal_count=(SELECT COUNT(*) FROM tagente_modulo, tagente_estado WHERE tagente_modulo.disabled=0 AND tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=' . $agent_id . ' AND estado=0),
+	critical_count=(SELECT COUNT(*) FROM tagente_modulo, tagente_estado WHERE tagente_modulo.disabled=0 AND tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=' . $agent_id . ' AND estado=1),
+	warning_count=(SELECT COUNT(*) FROM tagente_modulo, tagente_estado WHERE tagente_modulo.disabled=0 AND tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=' . $agent_id . ' AND estado=2),
+	unknown_count=(SELECT COUNT(*) FROM tagente_modulo, tagente_estado WHERE tagente_modulo.disabled=0 AND tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=' . $agent_id . ' AND estado=3),
+	notinit_count=(SELECT COUNT(*) FROM tagente_modulo, tagente_estado WHERE tagente_modulo.disabled=0 AND tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=' . $agent_id . ' AND estado=4),
+	total_count=(SELECT COUNT(*) FROM tagente_modulo, tagente_estado WHERE tagente_modulo.disabled=0 AND tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=' . $agent_id .
 	') WHERE id_agente = ' . $agent_id);
 }
 
@@ -3952,7 +3947,7 @@
 	my ($dbh, $agent_id) = @_;
 	
 	db_do ($dbh, 'UPDATE tagente SET update_alert_count=0,
-	fired_count=(SELECT COUNT(*) FROM tagente_modulo, talert_template_modules WHERE tagente_modulo.id_agente_modulo=talert_template_modules.id_agent_module AND talert_template_modules.disabled=0 AND times_fired>0 AND id_agente=' . $agent_id .
+	fired_count=(SELECT COUNT(*) FROM tagente_modulo, talert_template_modules WHERE tagente_modulo.disabled=0 AND tagente_modulo.id_agente_modulo=talert_template_modules.id_agent_module AND talert_template_modules.disabled=0 AND times_fired>0 AND id_agente=' . $agent_id .
 	') WHERE id_agente = ' . $agent_id);
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8097
          http://sourceforge.net/p/pandora/code/8097
Author:   ramonn
Date:     2013-05-03 18:00:53 +0000 (Fri, 03 May 2013)
Log Message:
-----------
2013-05-03  Ramon Novoa  <rnovoa@...>

	* lib/PandoraFMS/DataServer.pm: Add a default module_interval.

	* util/pandora_db.pl: Moved data deletion code to a generic function.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/lib/PandoraFMS/DataServer.pm
    trunk/pandora_server/util/pandora_db.pl

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-05-03 16:51:44 UTC (rev 8096)
+++ trunk/pandora_server/ChangeLog	2013-05-03 18:00:53 UTC (rev 8097)
@@ -1,3 +1,9 @@
+2013-05-03  Ramon Novoa  <rnovoa@...>
+
+	* lib/PandoraFMS/DataServer.pm: Add a default module_interval.
+
+	* util/pandora_db.pl: Moved data deletion code to a generic function.
+
 2013-04-26  Ramon Novoa  <rnovoa@...>
 
 	* lib/PandoraFMS/Core.pm: Adjusted module counts.

Modified: trunk/pandora_server/lib/PandoraFMS/DataServer.pm
===================================================================
--- trunk/pandora_server/lib/PandoraFMS/DataServer.pm	2013-05-03 16:51:44 UTC (rev 8096)
+++ trunk/pandora_server/lib/PandoraFMS/DataServer.pm	2013-05-03 18:00:53 UTC (rev 8097)
@@ -538,6 +538,7 @@
 	delete $module_conf->{'name'};
 
 	# Calculate the module interval in seconds
+	$module_conf->{'module_interval'} = 1 unless defined ($module_conf->{'module_interval'});
 	$module_conf->{'module_interval'} *= $interval if (defined ($module_conf->{'module_interval'}));
 
 	# Allow , as a decimal separator

Modified: trunk/pandora_server/util/pandora_db.pl
===================================================================
--- trunk/pandora_server/util/pandora_db.pl	2013-05-03 16:51:44 UTC (rev 8096)
+++ trunk/pandora_server/util/pandora_db.pl	2013-05-03 18:00:53 UTC (rev 8097)
@@ -85,54 +85,11 @@
 
 	my $ulimit_access_timestamp = time() - 86400;
 	my $ulimit_timestamp = time() - (86400 * $conf->{'_days_purge'});
-	my $limit_timestamp = strftime ("%Y-%m-%d %H:%M:%S", localtime($ulimit_timestamp));
 
-	my $first_mark;
-	my $total_time;
-	my $purge_steps;
-	my $purge_count;
-
-	my $mark1;
-	my $mark2;
-
-        # Numeric data deletion
-
+	# Delete old numeric data
 	print "[PURGE] Deleting old data... \n";
+	pandora_delete_old_module_data ('tagente_datos', $ulimit_access_timestamp, $ulimit_timestamp);
 
-	# This could be very timing consuming, so make this operation in $BIG_OPERATION_STEP 
-	# steps (100 fixed by default)
-	# Starting from the oldest record on the table
-
-	# WARNING. This code is EXTREMELLY important. This block (data deletion) could KILL a database if 
-	# you alter code and you don't know exactly what are you doing. Please take in mind this code executes each hour
-	# and has been patches MANY times. Before altering anything, think twice !
-
-	$first_mark =  get_db_value ($dbh, 'SELECT utimestamp FROM tagente_datos ORDER BY utimestamp ASC LIMIT 1');
-	if (defined ($first_mark)) {
-		$total_time = $ulimit_timestamp - $first_mark;
-		$purge_steps = int($total_time / $BIG_OPERATION_STEP);
-			
-		for (my $ax = 1; $ax <= $BIG_OPERATION_STEP; $ax++){
-
-			$mark1 = $first_mark + ($purge_steps * $ax);
-			$mark2 = $first_mark + ($purge_steps * ($ax -1));	
-		
-			# Let's split the intervals in $SMALL_OPERATION_STEP deletes each
-			$purge_count = get_db_value ($dbh, "SELECT COUNT(id_agente_modulo) FROM tagente_datos WHERE utimestamp < $mark1 AND utimestamp > $mark2");
-			while ($purge_count > 0){
-				print ".";
-				db_do ($dbh, "DELETE FROM tagente_datos WHERE utimestamp < $mark1 AND utimestamp > $mark2 LIMIT $SMALL_OPERATION_STEP");
-				# Do a nanosleep here for 0,001 sec
-                        	usleep (10000);
-				$purge_count = $purge_count - $SMALL_OPERATION_STEP;
-			}
-			print "\n[PURGE] Data deletion Progress (".$ax."%) ";
-		}
-		print "\n";
-	} else {
-		print "[PURGE] No data in tagente_datos\n";
-	}
-
     # Delete extended session data
     if (enterprise_load (\%conf) != 0) {
         db_do ($dbh, "DELETE FROM tsesion_extended WHERE id_sesion NOT IN ( SELECT id_sesion FROM tsesion );");
@@ -142,6 +99,10 @@
 
     # Delete inventory data, only if enterprise is enabled
     # We use the same value than regular data purge interval
+	my $first_mark;
+	my $total_time;
+	my $purge_steps;
+	my $purge_count;
 
     if (enterprise_load (\%conf) != 0) {
 
@@ -194,22 +155,11 @@
     if (!defined($conf->{'_string_purge'})){
         $conf->{'_string_purge'} = 7;
     }
+	$ulimit_access_timestamp = time() - 86400;
+	$ulimit_timestamp = time() - (86400 * $conf->{'_days_purge'});
+	print "[PURGE] Deleting old string data... \n";
+	pandora_delete_old_module_data ('tagente_datos_string', $ulimit_access_timestamp, $ulimit_timestamp);
 
-    my $string_limit = time() - 86400 * $conf->{'_string_purge'};
-	$first_mark =  get_db_value ($dbh, 'SELECT utimestamp FROM tagente_datos_string ORDER BY utimestamp ASC LIMIT 1');
-	if (defined ($first_mark)) {
-		$total_time = $string_limit - $first_mark;
-		$purge_steps = int($total_time / $BIG_OPERATION_STEP);
-	
-		for (my $ax = 1; $ax <= $BIG_OPERATION_STEP; $ax++){
-			db_do ($dbh, "DELETE FROM tagente_datos_string WHERE utimestamp < ". ($first_mark + ($purge_steps * $ax)) . " AND utimestamp >= ". $first_mark );
-			print "[PURGE] String deletion Progress %$ax .. \r";
-		}
-	    print "\n";
-	} else {
-		print "[PURGE] No data in tagente_datos_string\n";
-	}
-
     # Delete event data
     if (!defined($conf->{'_event_purge'})){
         $conf->{'_event_purge'}= 10;
@@ -736,6 +686,55 @@
 	exit -1;
 }
 
+##############################################################################
+# Delete old module data.
+##############################################################################
+sub pandora_delete_old_module_data {
+	my ($table, $ulimit_access_timestamp, $ulimit_timestamp) = @_;
+	
+	my $first_mark;
+	my $total_time;
+	my $purge_steps;
+	my $purge_count;
+
+	my $mark1;
+	my $mark2;
+
+	# This could be very timing consuming, so make this operation in $BIG_OPERATION_STEP 
+	# steps (100 fixed by default)
+	# Starting from the oldest record on the table
+
+	# WARNING. This code is EXTREMELLY important. This block (data deletion) could KILL a database if 
+	# you alter code and you don't know exactly what are you doing. Please take in mind this code executes each hour
+	# and has been patches MANY times. Before altering anything, think twice !
+
+	$first_mark =  get_db_value ($dbh, "SELECT utimestamp FROM $table ORDER BY utimestamp ASC LIMIT 1");
+	if (defined ($first_mark)) {
+		$total_time = $ulimit_timestamp - $first_mark;
+		$purge_steps = int($total_time / $BIG_OPERATION_STEP);
+			
+		for (my $ax = 1; $ax <= $BIG_OPERATION_STEP; $ax++){
+
+			$mark1 = $first_mark + ($purge_steps * $ax);
+			$mark2 = $first_mark + ($purge_steps * ($ax -1));	
+		
+			# Let's split the intervals in $SMALL_OPERATION_STEP deletes each
+			$purge_count = get_db_value ($dbh, "SELECT COUNT(id_agente_modulo) FROM $table WHERE utimestamp < $mark1 AND utimestamp > $mark2");
+			while ($purge_count > 0){
+				print ".";
+				db_do ($dbh, "DELETE FROM $table WHERE utimestamp < $mark1 AND utimestamp > $mark2 LIMIT $SMALL_OPERATION_STEP");
+				# Do a nanosleep here for 0,001 sec
+                        	usleep (10000);
+				$purge_count = $purge_count - $SMALL_OPERATION_STEP;
+			}
+			print "\n[PURGE] Data deletion Progress (".$ax."%) ";
+		}
+		print "\n";
+	} else {
+		print "[PURGE] No data in $table\n";
+	}
+}
+
 ###############################################################################
 # Main
 ###############################################################################

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8110
          http://sourceforge.net/p/pandora/code/8110
Author:   ramonn
Date:     2013-05-07 15:38:11 +0000 (Tue, 07 May 2013)
Log Message:
-----------
2013-05-07  Ramon Novoa  <rnovoa@...>

	* lib/PandoraFMS/DB.pm,
	  util/pandora_db.pl: Several improvements. Added support for detecting
	  other running instances of the script.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/lib/PandoraFMS/DB.pm
    trunk/pandora_server/util/pandora_db.pl

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-05-07 14:56:04 UTC (rev 8109)
+++ trunk/pandora_server/ChangeLog	2013-05-07 15:38:11 UTC (rev 8110)
@@ -1,3 +1,9 @@
+2013-05-07  Ramon Novoa  <rnovoa@...>
+
+	* lib/PandoraFMS/DB.pm,
+	  util/pandora_db.pl: Several improvements. Added support for detecting
+	  other running instances of the script.
+
 2013-05-03  Ramon Novoa  <rnovoa@...>
 
 	* lib/PandoraFMS/DataServer.pm: Add a default module_interval.

Modified: trunk/pandora_server/lib/PandoraFMS/DB.pm
===================================================================
--- trunk/pandora_server/lib/PandoraFMS/DB.pm	2013-05-07 14:56:04 UTC (rev 8109)
+++ trunk/pandora_server/lib/PandoraFMS/DB.pm	2013-05-07 15:38:11 UTC (rev 8110)
@@ -36,10 +36,12 @@
 		db_connect
 		db_disconnect
 		db_do
+		db_get_lock
 		db_insert
 		db_insert_get_values
 		db_process_insert
 		db_process_update
+		db_release_lock
 		db_string
 		db_text
 		db_update
@@ -945,6 +947,37 @@
 	return ($columns, \@values);
 }
 
+########################################################################
+## Try to obtain the given lock.
+########################################################################
+sub db_get_lock($$;$) {
+	my ($dbh, $lock_name, $lock_timeout) = @_;
+	
+	# Set a default lock timeout of 1 second
+	$lock_timeout = 1 if (! defined ($lock_timeout));
+	
+	# Attempt to get the lock!
+	my $sth = $dbh->prepare('SELECT GET_LOCK(?, ?)');
+	$sth->execute($lock_name, $lock_timeout);
+	my ($lock) = $sth->fetchrow;
+
+	# Something went wrong
+	return 0 if (! defined ($lock));
+	
+	return $lock;
+}
+
+########################################################################
+## Release the given lock.
+########################################################################
+sub db_release_lock($$) {
+	my ($dbh, $lock_name) = @_;
+	
+	my $sth = $dbh->prepare('SELECT RELEASE_LOCK(?)');
+	$sth->execute($lock_name);
+	my ($lock) = $sth->fetchrow;
+}
+
 # End of function declaration
 # End of defined Code
 

Modified: trunk/pandora_server/util/pandora_db.pl
===================================================================
--- trunk/pandora_server/util/pandora_db.pl	2013-05-07 14:56:04 UTC (rev 8109)
+++ trunk/pandora_server/util/pandora_db.pl	2013-05-07 15:38:11 UTC (rev 8110)
@@ -19,6 +19,7 @@
 
 # Includes list
 use strict;
+use warnings;
 use Time::Local;		# DateTime basic manipulation
 use DBI;				# DB interface with MySQL
 use POSIX qw(strftime);
@@ -43,32 +44,6 @@
 # FLUSH in each IO 
 $| = 1;
 
-# Init
-pandora_init(\%conf);
-
-# Read config file
-pandora_load_config (\%conf);
-
-# Load enterprise module
-if (enterprise_load (\%conf) == 0) {
-	print " [*] Pandora FMS Enterprise module not available.\n\n";
-} else {
-	print " [*] Pandora FMS Enterprise module loaded.\n\n";
-}
-
-# Connect to the DB
-my $dbh = db_connect ('mysql', $conf{'dbname'}, $conf{'dbhost'}, $conf{'dbport'}, $conf{'dbuser'}, $conf{'dbpass'});
-my $history_dbh = ($conf{'_history_db_enabled'} eq '1') ? db_connect ('mysql', $conf{'_history_db_name'},
-		$conf{'_history_db_host'}, '3306', $conf{'_history_db_user'}, $conf{'_history_db_pass'}) : undef;
-
-# Main
-pandoradb_main(\%conf, $dbh, $history_dbh);
-
-# Cleanup and exit
-db_disconnect ($history_dbh) if defined ($history_dbh);
-db_disconnect ($dbh);
-exit;
-
 ###############################################################################
 # Delete old data from the database.
 ###############################################################################
@@ -88,7 +63,7 @@
 
 	# Delete old numeric data
 	print "[PURGE] Deleting old data... \n";
-	pandora_delete_old_module_data ('tagente_datos', $ulimit_access_timestamp, $ulimit_timestamp);
+	pandora_delete_old_module_data ($dbh, 'tagente_datos', $ulimit_access_timestamp, $ulimit_timestamp);
 
     # Delete extended session data
     if (enterprise_load (\%conf) != 0) {
@@ -158,7 +133,7 @@
 	$ulimit_access_timestamp = time() - 86400;
 	$ulimit_timestamp = time() - (86400 * $conf->{'_days_purge'});
 	print "[PURGE] Deleting old string data... \n";
-	pandora_delete_old_module_data ('tagente_datos_string', $ulimit_access_timestamp, $ulimit_timestamp);
+	pandora_delete_old_module_data ($dbh, 'tagente_datos_string', $ulimit_access_timestamp, $ulimit_timestamp);
 
     # Delete event data
     if (!defined($conf->{'_event_purge'})){
@@ -224,7 +199,7 @@
 	
     my $trap_limit = time() - 86400 * $conf->{'_trap_purge'};
     $trap_limit = strftime ("%Y-%m-%d %H:%M:%S", localtime($trap_limit));
-    print "[PURGE] Deleting old SNMP traps data (More than " . $conf->{'__trap_purge'} . " days)... \n";
+    print "[PURGE] Deleting old SNMP traps data (More than " . $conf->{'_trap_purge'} . " days)... \n";
 	db_do($dbh, "DELETE FROM ttrap WHERE timestamp < '$trap_limit'");
 	
     # Delete policy queue data
@@ -237,7 +212,7 @@
 
     my $gis_limit = time() - 86400 * $conf->{'_gis_purge'};
     $gis_limit = strftime ("%Y-%m-%d %H:%M:%S", localtime($gis_limit));
-    print "[PURGE] Deleting old GID data (More than " . $conf->{'__gis_purge'} . " days)... \n";
+    print "[PURGE] Deleting old GID data (More than " . $conf->{'_gis_purge'} . " days)... \n";
 	db_do($dbh, "DELETE FROM tgis_data_history WHERE end_timestamp < '$gis_limit'");
 
     # Delete pending modules
@@ -370,7 +345,7 @@
 		if ($sub_dir < $limits->[$depth]) {
 			rmtree ($dir . '/' . $sub_dir);
 		} elsif ($sub_dir == $limits->[$depth]) {
-			pandora_purge_log_dir ($dir . '/' . $sub_dir, $limits, $depth + 1)
+			&pandora_purge_log_dir ($dir . '/' . $sub_dir, $limits, $depth + 1)
 		}
 	}
 	
@@ -469,6 +444,8 @@
 	help_screen () if ($#ARGV < 0);
 	
 	$conf->{'_pandora_path'} = shift(@ARGV);
+	$conf->{'_onlypurge'} = 0;
+	$conf->{'_force'} = 0;
 	
 	# If there are valid parameters store it
 	foreach my $param (@ARGV) {	
@@ -486,6 +463,9 @@
 		elsif ($param =~ m/-d\z/i) {
 			$conf->{'_debug'} = 1;
 		}
+		elsif ($param =~ m/-f\z/i) {
+			$conf->{'_force'} = 1;
+		}
 	}
 
 	help_screen () if ($conf->{'_pandora_path'} eq '');
@@ -682,7 +662,8 @@
 ##############################################################################
 sub help_screen{
 	print "Usage: $0 <path to pandora_server.conf> [options]\n\n";
-	print "\t\t-p   Only purge and consistency check, skip compact.\n\n";
+	print "\t\t-p   Only purge and consistency check, skip compact.\n";
+	print "\t\t-f   Force execution event if another instance of $0 is running.\n\n";
 	exit -1;
 }
 
@@ -690,7 +671,7 @@
 # Delete old module data.
 ##############################################################################
 sub pandora_delete_old_module_data {
-	my ($table, $ulimit_access_timestamp, $ulimit_timestamp) = @_;
+	my ($dbh, $table, $ulimit_access_timestamp, $ulimit_timestamp) = @_;
 	
 	my $first_mark;
 	my $total_time;
@@ -727,6 +708,7 @@
                         	usleep (10000);
 				$purge_count = $purge_count - $SMALL_OPERATION_STEP;
 			}
+			
 			print "\n[PURGE] Data deletion Progress (".$ax."%) ";
 		}
 		print "\n";
@@ -741,7 +723,7 @@
 sub pandoradb_main ($$$) {
 	my ($conf, $dbh, $history_dbh) = @_;
 
-	print "Starting at ". strftime ("%Y-%m-%d %H:%M:%S", localtime()) . "\n";	
+	print "Starting at ". strftime ("%Y-%m-%d %H:%M:%S", localtime()) . "\n";
 
 	# Purge
 	pandora_purgedb ($conf, $dbh);
@@ -768,5 +750,43 @@
 	db_do ($dbh, "INSERT INTO tconfig (token, value) VALUES ('db_maintance', '".time()."')");
 
 	print "\nEnding at ". strftime ("%Y-%m-%d %H:%M:%S", localtime()) . "\n";
-    exit 0;
 }
+
+# Init
+pandora_init(\%conf);
+
+# Read config file
+pandora_load_config (\%conf);
+
+# Load enterprise module
+if (enterprise_load (\%conf) == 0) {
+	print " [*] Pandora FMS Enterprise module not available.\n\n";
+} else {
+	print " [*] Pandora FMS Enterprise module loaded.\n\n";
+}
+
+# Connect to the DB
+my $dbh = db_connect ('mysql', $conf{'dbname'}, $conf{'dbhost'}, $conf{'dbport'}, $conf{'dbuser'}, $conf{'dbpass'});
+my $history_dbh = ($conf{'_history_db_enabled'} eq '1') ? db_connect ('mysql', $conf{'_history_db_name'},
+		$conf{'_history_db_host'}, '3306', $conf{'_history_db_user'}, $conf{'_history_db_pass'}) : undef;
+
+# Get a lock
+my $lock = db_get_lock ($dbh, 'pandora_db');
+if ($lock == 0 && $conf{'_force'} == 0) { 
+	print " [*] Another instance of pandora_db seems to be running.\n\n";
+	exit 1;
+}
+
+# Main
+pandoradb_main(\%conf, $dbh, $history_dbh);
+
+# Cleanup and exit
+db_disconnect ($history_dbh) if defined ($history_dbh);
+db_disconnect ($dbh);
+
+# Release the lock
+if ($lock == 1) {
+	db_release_lock ($dbh, 'pandora_db');
+}
+
+exit 0;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8111
          http://sourceforge.net/p/pandora/code/8111
Author:   ramonn
Date:     2013-05-07 17:02:02 +0000 (Tue, 07 May 2013)
Log Message:
-----------
2013-05-07  Ramon Novoa  <rnovoa@...>

	* lib/PandoraFMS/Tools.pm: Added a function to resolve hostnames.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/lib/PandoraFMS/Tools.pm

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-05-07 15:38:11 UTC (rev 8110)
+++ trunk/pandora_server/ChangeLog	2013-05-07 17:02:02 UTC (rev 8111)
@@ -1,5 +1,9 @@
 2013-05-07  Ramon Novoa  <rnovoa@...>
 
+	* lib/PandoraFMS/Tools.pm: Added a function to resolve hostnames.
+
+2013-05-07  Ramon Novoa  <rnovoa@...>
+
 	* lib/PandoraFMS/DB.pm,
 	  util/pandora_db.pl: Several improvements. Added support for detecting
 	  other running instances of the script.

Modified: trunk/pandora_server/lib/PandoraFMS/Tools.pm
===================================================================
--- trunk/pandora_server/lib/PandoraFMS/Tools.pm	2013-05-07 15:38:11 UTC (rev 8110)
+++ trunk/pandora_server/lib/PandoraFMS/Tools.pm	2013-05-07 17:02:02 UTC (rev 8111)
@@ -24,6 +24,7 @@
 use PandoraFMS::Sendmail;
 use HTML::Entities;
 use Encode;
+use Socket qw(inet_ntoa inet_aton);
 
 # New in 3.2. Used to sendmail internally, without external scripts
 # use Module::Loaded;
@@ -65,6 +66,7 @@
 	md5_init
 	pandora_ping
 	pandora_ping_latency
+	resolve_hostname
 	ticks_totime
 	safe_input
 	safe_output
@@ -1163,6 +1165,15 @@
 	return $target;
 }
 
+###############################################################################
+# Attempt to resolve the given hostname.
+###############################################################################
+sub resolve_hostname ($) {
+	my ($hostname) = @_;
+	
+	return inet_ntoa(inet_aton($hostname));
+}
+
 # End of function declaration
 # End of defined Code
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8118
          http://sourceforge.net/p/pandora/code/8118
Author:   ramonn
Date:     2013-05-10 11:19:02 +0000 (Fri, 10 May 2013)
Log Message:
-----------
2013-05-10  Ramon Novoa  <rnovoa@...>

	* lib/PandoraFMS/Tools.pm: Check that inet_aton does not return undef.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/lib/PandoraFMS/Tools.pm

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-05-10 11:18:20 UTC (rev 8117)
+++ trunk/pandora_server/ChangeLog	2013-05-10 11:19:02 UTC (rev 8118)
@@ -1,3 +1,7 @@
+2013-05-10  Ramon Novoa  <rnovoa@...>
+
+	* lib/PandoraFMS/Tools.pm: Check that inet_aton does not return undef.
+
 2013-05-07  Ramon Novoa  <rnovoa@...>
 
 	* lib/PandoraFMS/Tools.pm: Added a function to resolve hostnames.

Modified: trunk/pandora_server/lib/PandoraFMS/Tools.pm
===================================================================
--- trunk/pandora_server/lib/PandoraFMS/Tools.pm	2013-05-10 11:18:20 UTC (rev 8117)
+++ trunk/pandora_server/lib/PandoraFMS/Tools.pm	2013-05-10 11:19:02 UTC (rev 8118)
@@ -1171,7 +1171,10 @@
 sub resolve_hostname ($) {
 	my ($hostname) = @_;
 	
-	return inet_ntoa(inet_aton($hostname));
+	$resolved_hostname = inet_aton($hostname);
+	return $hostname if (! defined ($resolved_hostname));
+	
+	return inet_ntoa($resolved_hostname);
 }
 
 # End of function declaration

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8121
          http://sourceforge.net/p/pandora/code/8121
Author:   slerena
Date:     2013-05-13 02:40:28 +0000 (Mon, 13 May 2013)
Log Message:
-----------
2013-05-13  Sancho Lerena <slerena@...>

        * lib/PandoraFMS/Core.pm: Fixes crash on inverse resolution for
        GIS information on openstreetmaps. This was due function was moved from
        Dataserver to Core.pm and include for LWP::Simple not :(

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/lib/PandoraFMS/Core.pm

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-05-12 00:06:18 UTC (rev 8120)
+++ trunk/pandora_server/ChangeLog	2013-05-13 02:40:28 UTC (rev 8121)
@@ -1,3 +1,9 @@
+2013-05-13  Sancho Lerena <slerena@...>
+
+	* lib/PandoraFMS/Core.pm: Fixes crash on inverse resolution for
+	GIS information on openstreetmaps. This was due function was moved from
+	Dataserver to Core.pm and include for LWP::Simple not :(
+
 2013-05-10  Ramon Novoa  <rnovoa@...>
 
 	* lib/PandoraFMS/Tools.pm: Check that inet_aton does not return undef.

Modified: trunk/pandora_server/lib/PandoraFMS/Core.pm
===================================================================
--- trunk/pandora_server/lib/PandoraFMS/Core.pm	2013-05-12 00:06:18 UTC (rev 8120)
+++ trunk/pandora_server/lib/PandoraFMS/Core.pm	2013-05-13 02:40:28 UTC (rev 8121)
@@ -123,6 +123,9 @@
 use PandoraFMS::Tools;
 use PandoraFMS::GIS qw(distance_moved);
 
+# For Reverse Geocoding
+use LWP::Simple;
+
 #use Data::Dumper;
 
 require Exporter;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8123
          http://sourceforge.net/p/pandora/code/8123
Author:   ramonn
Date:     2013-05-13 10:29:03 +0000 (Mon, 13 May 2013)
Log Message:
-----------
2013-05-13  Ramon Novoa  <rnovoa@...>

	* lib/PandoraFMS/Tools.pm: Merged from 4.0 branch. Directly call
	  snmptranslate, since SNMP::translateObj does not seem to load
	  enterprise MIBs.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/lib/PandoraFMS/Tools.pm

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-05-13 10:18:08 UTC (rev 8122)
+++ trunk/pandora_server/ChangeLog	2013-05-13 10:29:03 UTC (rev 8123)
@@ -1,3 +1,9 @@
+2013-05-13  Ramon Novoa  <rnovoa@...>
+
+	* lib/PandoraFMS/Tools.pm: Merged from 4.0 branch. Directly call
+	  snmptranslate, since SNMP::translateObj does not seem to load
+	  enterprise MIBs.
+
 2013-05-13  Sancho Lerena <slerena@...>
 
 	* lib/PandoraFMS/Core.pm: Fixes crash on inverse resolution for

Modified: trunk/pandora_server/lib/PandoraFMS/Tools.pm
===================================================================
--- trunk/pandora_server/lib/PandoraFMS/Tools.pm	2013-05-13 10:18:08 UTC (rev 8122)
+++ trunk/pandora_server/lib/PandoraFMS/Tools.pm	2013-05-13 10:29:03 UTC (rev 8123)
@@ -984,15 +984,13 @@
 sub translate_obj ($$) {
 	my ($dbh, $obj) = @_;
 
-	# SNMP is not thread safe
-	if (defined ($SNMPSem)) {
-		$SNMPSem->down ();
+	# Translate!
+	my $oid = `snmptranslate -On -mALL $obj 2>/dev/null`;
+	if ($? != 0) {
+		return undef;
 	}
-	my $oid = SNMP::translateObj ($obj);
-	if (defined ($SNMPSem)) {
-		$SNMPSem->up ();
-	}
-		
+	chomp($oid);
+	
 	return $oid;
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8131
          http://sourceforge.net/p/pandora/code/8131
Author:   ramonn
Date:     2013-05-14 13:56:43 +0000 (Tue, 14 May 2013)
Log Message:
-----------
2013-05-14  Ramon Novoa  <rnovoa@...>

	* lib/PandoraFMS/NetworkServer.pm: Added the Pandora FMS's console MIB
	  to snmp* calls.

	* pandora_server_installer,
	  pandora_server.spec,
	  lib/PandoraFMS/Tools.pm,
	  lib/PandoraFMS/Config.pm,
	  Makefile.PL,
	  pandora_server.redhat.spec,
	  DEBIAN/control: Removed PERL's SNMP lib from the deps.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/DEBIAN/control
    trunk/pandora_server/Makefile.PL
    trunk/pandora_server/lib/PandoraFMS/Config.pm
    trunk/pandora_server/lib/PandoraFMS/NetworkServer.pm
    trunk/pandora_server/lib/PandoraFMS/Tools.pm
    trunk/pandora_server/pandora_server.redhat.spec
    trunk/pandora_server/pandora_server.spec
    trunk/pandora_server/pandora_server_installer

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-05-14 11:56:43 UTC (rev 8130)
+++ trunk/pandora_server/ChangeLog	2013-05-14 13:56:43 UTC (rev 8131)
@@ -1,3 +1,16 @@
+2013-05-14  Ramon Novoa  <rnovoa@...>
+
+	* lib/PandoraFMS/NetworkServer.pm: Added the Pandora FMS's console MIB
+	  to snmp* calls.
+
+	* pandora_server_installer,
+	  pandora_server.spec,
+	  lib/PandoraFMS/Tools.pm,
+	  lib/PandoraFMS/Config.pm,
+	  Makefile.PL,
+	  pandora_server.redhat.spec,
+	  DEBIAN/control: Removed PERL's SNMP lib from the deps.
+
 2013-05-13  Ramon Novoa  <rnovoa@...>
 
 	* lib/PandoraFMS/Tools.pm: Merged from 4.0 branch. Directly call

Modified: trunk/pandora_server/DEBIAN/control
===================================================================
--- trunk/pandora_server/DEBIAN/control	2013-05-14 11:56:43 UTC (rev 8130)
+++ trunk/pandora_server/DEBIAN/control	2013-05-14 13:56:43 UTC (rev 8131)
@@ -6,5 +6,5 @@
 Installed-Size: 640
 Maintainer: Miguel de Dios <miguel.dedios@...>
 Homepage: http://pandorafms.org/
-Depends: perl (>= 5.8), libdbi-perl, libdbd-mysql-perl, libtime-format-perl, libnetaddr-ip-perl, libtime-format-perl, libxml-simple-perl, libxml-twig-perl, libhtml-parser-perl, snmp, snmpd, traceroute, xprobe2, nmap, sudo, libwww-perl, libsocket6-perl, libio-socket-inet6-perl, libsnmp-perl, snmp-mibs-downloader, libjson-perl
+Depends: perl (>= 5.8), libdbi-perl, libdbd-mysql-perl, libtime-format-perl, libnetaddr-ip-perl, libtime-format-perl, libxml-simple-perl, libxml-twig-perl, libhtml-parser-perl, snmp, snmpd, traceroute, xprobe2, nmap, sudo, libwww-perl, libsocket6-perl, libio-socket-inet6-perl, snmp-mibs-downloader, libjson-perl
 Description: Pandora FMS is a monitoring system for big IT environments. It uses remote tests, or local agents to grab information. Pandora supports all standard OS (Linux, AIX, HP-UX, Solaris and Windows XP,2000/2003), and support multiple setups in HA enviroments. This is the server package. Server makes the remote checks and process information transfer by Pandora FMS agents to the server.

Modified: trunk/pandora_server/Makefile.PL
===================================================================
--- trunk/pandora_server/Makefile.PL	2013-05-14 11:56:43 UTC (rev 8130)
+++ trunk/pandora_server/Makefile.PL	2013-05-14 13:56:43 UTC (rev 8131)
@@ -17,7 +17,6 @@
 	PREREQ_PM 	=> {
 		NetAddr::IP => 0,
 		DBI => 0,
-		SNMP => 0,
 		threads::shared => 0,
 		IO::Socket => 0,
 		Socket6 => 0,

Modified: trunk/pandora_server/lib/PandoraFMS/Config.pm
===================================================================
--- trunk/pandora_server/lib/PandoraFMS/Config.pm	2013-05-14 11:56:43 UTC (rev 8130)
+++ trunk/pandora_server/lib/PandoraFMS/Config.pm	2013-05-14 13:56:43 UTC (rev 8131)
@@ -152,6 +152,9 @@
 	# Log module configuration
 	$pa_config->{"log_dir"} = pandora_get_tconfig_token ($dbh, 'log_dir', '/var/spool/pandora/data_in/log');
 	$pa_config->{"log_interval"} = pandora_get_tconfig_token ($dbh, 'log_interval', 3600);
+
+	# Pandora FMS Console's attachment directory
+	$pa_config->{"attachment_dir"} = pandora_get_tconfig_token ($dbh, 'attachment_store', '/var/www/pandora_console/attachment');
 }
 
 ##########################################################################

Modified: trunk/pandora_server/lib/PandoraFMS/NetworkServer.pm
===================================================================
--- trunk/pandora_server/lib/PandoraFMS/NetworkServer.pm	2013-05-14 11:56:43 UTC (rev 8130)
+++ trunk/pandora_server/lib/PandoraFMS/NetworkServer.pm	2013-05-14 13:56:43 UTC (rev 8131)
@@ -27,7 +27,6 @@
 use IO::Socket::INET6;
 use HTML::Entities;
 use POSIX qw(strftime);
-use SNMP;
 
 # Default lib dir for RPM and DEB packages
 use lib '/usr/lib/perl5';
@@ -285,6 +284,9 @@
 	$snmp_target = $snmp_target.":".$snmp_port;
     }
 
+	# Pandora FMS's console MIB directory
+	my $mib_dir = $pa_config->{'attachment_dir'} . '/mibs';
+	
     # On windows, we need the snmpget command from net-snmp, already present on win agent
     # the call is the same than in linux
     if (($OSNAME eq "MSWin32") || ($OSNAME eq "MSWin32-x64") || ($OSNAME eq "cygwin")){
@@ -298,9 +300,9 @@
     # by default LINUX/FreeBSD/Solaris calls
     else {
         if ($snmp_version ne "3"){
-            $output = `$snmpget_cmd -v $snmp_version -r $snmp_retries -t $snmp_timeout -OUevqt -c '$snmp_community' $snmp_target $snmp_oid 2>/dev/null`;
+            $output = `$snmpget_cmd -M+"$mib_dir" -v $snmp_version -r $snmp_retries -t $snmp_timeout -OUevqt -c '$snmp_community' $snmp_target $snmp_oid 2>/dev/null`;
         } else {
-            $output = `$snmpget_cmd -v $snmp_version -r $snmp_retries -t $snmp_timeout -OUevqt -l $snmp3_security_level $snmp3_extra $snmp_target $snmp_oid 2>/dev/null`;
+            $output = `$snmpget_cmd -M+"$mib_dir" -v $snmp_version -r $snmp_retries -t $snmp_timeout -OUevqt -l $snmp3_security_level $snmp3_extra $snmp_target $snmp_oid 2>/dev/null`;
         }
     }
 
@@ -345,7 +347,7 @@
 
 	return (undef, 0) unless ($snmp_oid ne '');
 	if ($snmp_oid =~ m/[a-zA-Z]/) {
-		$snmp_oid = translate_obj ($dbh, $snmp_oid, );
+		$snmp_oid = translate_obj ($pa_config, $dbh, $snmp_oid, );
 		
 		# Could not translate OID, disable the module
 		if (! defined ($snmp_oid) || $snmp_oid eq '') {

Modified: trunk/pandora_server/lib/PandoraFMS/Tools.pm
===================================================================
--- trunk/pandora_server/lib/PandoraFMS/Tools.pm	2013-05-14 11:56:43 UTC (rev 8130)
+++ trunk/pandora_server/lib/PandoraFMS/Tools.pm	2013-05-14 13:56:43 UTC (rev 8131)
@@ -981,11 +981,15 @@
 ###############################################################################
 # Convert a text obj tag to an OID and update the module configuration.
 ###############################################################################
-sub translate_obj ($$) {
-	my ($dbh, $obj) = @_;
+sub translate_obj ($$$) {
+	my ($pa_config, $dbh, $obj) = @_;
 
+	# Pandora FMS's console MIB directory
+	my $mib_dir = $pa_config->{'attachment_dir'} . '/mibs';
+
 	# Translate!
-	my $oid = `snmptranslate -On -mALL $obj 2>/dev/null`;
+	my $oid = `snmptranslate -On -mALL -M+"$mib_dir" $obj 2>/dev/null`;
+
 	if ($? != 0) {
 		return undef;
 	}

Modified: trunk/pandora_server/pandora_server.redhat.spec
===================================================================
--- trunk/pandora_server/pandora_server.redhat.spec	2013-05-14 11:56:43 UTC (rev 8130)
+++ trunk/pandora_server/pandora_server.redhat.spec	2013-05-14 13:56:43 UTC (rev 8131)
@@ -27,7 +27,7 @@
 Requires:           perl-XML-Simple perl-XML-Twig net-snmp-utils
 Requires:           perl-NetAddr-IP net-snmp net-tools
 Requires:           perl-IO-Socket-INET6 perl-Socket6
-Requires:           nmap wmic sudo net-snmp-perl perl-JSON
+Requires:           nmap wmic sudo perl-JSON
 
 %description
 Pandora FMS is a monitoring system for big IT environments. It uses remote tests, or local agents to grab information. Pandora supports all standard OS (Linux, AIX, HP-UX, Solaris and Windows XP,2000/2003), and support multiple setups in HA enviroments.

Modified: trunk/pandora_server/pandora_server.spec
===================================================================
--- trunk/pandora_server/pandora_server.spec	2013-05-14 11:56:43 UTC (rev 8130)
+++ trunk/pandora_server/pandora_server.spec	2013-05-14 13:56:43 UTC (rev 8131)
@@ -25,7 +25,7 @@
 Requires:           perl-DBI perl-DBD-mysql perl-libwww-perl
 Requires:           perl-NetAddr-IP net-snmp net-tools perl-XML-Twig
 Requires:           nmap wmic sudo perl-HTML-Tree perl-XML-Simple
-Requires:           perl-IO-Socket-INET6 perl-Socket6 perl-SNMP snmp-mibs perl-JSON
+Requires:           perl-IO-Socket-INET6 perl-Socket6 snmp-mibs perl-JSON
 
 %description
 

Modified: trunk/pandora_server/pandora_server_installer
===================================================================
--- trunk/pandora_server/pandora_server_installer	2013-05-14 11:56:43 UTC (rev 8130)
+++ trunk/pandora_server/pandora_server_installer	2013-05-14 13:56:43 UTC (rev 8131)
@@ -109,17 +109,17 @@
 		echo "The complete installation guide is at: http://openideas.info/wiki/index.php?title=Pandora"
 		echo " "
 		echo "Debian-based distribution do:"
-		echo "	# apt-get install snmp snmpd libjson-perllibio-socket-inet6-perl libsocket6-perl libxml-simple-perl libxml-twig-perl libnetaddr-ip-perl libdbi-perl libsnmp-perl libnetaddr-ip-perl libhtml-parser-perl wmi-client xprobe2 snmp-mibs-downloader"
+		echo "	# apt-get install snmp snmpd libjson-perllibio-socket-inet6-perl libsocket6-perl libxml-simple-perl libxml-twig-perl libnetaddr-ip-perl libdbi-perl libnetaddr-ip-perl libhtml-parser-perl wmi-client xprobe2 snmp-mibs-downloader"
 		echo " "
 		echo "For CentOS / RHEL do: "
 		echo " "
-		echo "	# yum install perl-XML-Simple* perl-XML-Twig  perl-JSON perl-IO-Socket* perl-Socket6 perl-Time-modules* perl-NetAddr-IP* perl-DateTime* perl-ExtUtils perl-DBI perl-SNMP nmap "
+		echo "	# yum install perl-XML-Simple* perl-XML-Twig  perl-JSON perl-IO-Socket* perl-Socket6 perl-Time-modules* perl-NetAddr-IP* perl-DateTime* perl-ExtUtils perl-DBI nmap "
 		echo " "
 		echo "For OpenSUSE / SLES do : "
 		echo " "
 		echo "	# zypper install nmap perl-DBD-mysql perl-DBI perl-HTML-Parser perl-JSON
 perl-HTML-Encoding perl-HTML-Tree perl-NetAddr-IP perl-IO-Socket-INET6 perl-Socket6
-perl-TimeDate perl-XML-Simple perl-XML-Twig perl-libwww-perl mysql-client perl-SNMP"
+perl-TimeDate perl-XML-Simple perl-XML-Twig perl-libwww-perl mysql-client"
 		echo " "
 		echo "	You also will need to install (optionally) xprobe2 and wmiclient from rpm (download from our website)"
 		echo " "
@@ -134,12 +134,12 @@
 		echo "  # make install"
 		echo " "
 		echo "  Install following tools from ports. Don't use packages."
-		echo "  Recommended: p5-DBI p5-NetAddr-IP p5-XML-Simple p5-XML-Twig p5-HTML-Parser p5-Net-SNMP p5-SNMP p5-DBD-mysql p5-Socket6 p5-IO-Socket-INET6"
+		echo "  Recommended: p5-DBI p5-NetAddr-IP p5-XML-Simple p5-XML-Twig p5-HTML-Parser p5-DBD-mysql p5-Socket6 p5-IO-Socket-INET6"
 		echo "  Optional: nmap xprobe"
 		echo " "
 		echo "To get it from source through CPAN do"
 		echo " "
-		echo "	$ cpan Time::Local DBI SNMP Socket6 XML::Simple XML::Twig IO::Socket Time::HiRes NetAddr::IP HTML::Entities IO::Socket::INET6 JSON"
+		echo "	$ cpan Time::Local DBI Socket6 XML::Simple XML::Twig IO::Socket Time::HiRes NetAddr::IP HTML::Entities IO::Socket::INET6 JSON"
 		echo " "
 		rm output
 	else

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8138
          http://sourceforge.net/p/pandora/code/8138
Author:   ramonn
Date:     2013-05-16 08:39:44 +0000 (Thu, 16 May 2013)
Log Message:
-----------
2013-05-16  Ramon Novoa  <rnovoa@...>

	* bin/pandora_server: Added information about the loading of the
	  enterprise module to the log.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/bin/pandora_server

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-05-16 08:23:51 UTC (rev 8137)
+++ trunk/pandora_server/ChangeLog	2013-05-16 08:39:44 UTC (rev 8138)
@@ -1,3 +1,8 @@
+2013-05-16  Ramon Novoa  <rnovoa@...>
+
+	* bin/pandora_server: Added information about the loading of the
+	  enterprise module to the log.
+
 2013-05-14  Ramon Novoa  <rnovoa@...>
 
 	* lib/PandoraFMS/NetworkServer.pm: Added the Pandora FMS's console MIB

Modified: trunk/pandora_server/bin/pandora_server
===================================================================
--- trunk/pandora_server/bin/pandora_server	2013-05-16 08:23:51 UTC (rev 8137)
+++ trunk/pandora_server/bin/pandora_server	2013-05-16 08:39:44 UTC (rev 8138)
@@ -342,8 +342,10 @@
 # Load enterprise module
 if (enterprise_load (\%Config) == 0) {
 	print_message (\%Config, " [*] Pandora FMS Enterprise module not available.", 1);
+	logger (\%Config, " [*] Pandora FMS Enterprise module not available.", 1);
 } else {
 	print_message (\%Config, " [*] Pandora FMS Enterprise module loaded.", 1);
+	logger (\%Config, " [*] Pandora FMS Enterprise module loaded.", 1);
 
 	if($Config{'policy_manager'} == 1) {
 		# Start thread to patrol policy queue

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8163
          http://sourceforge.net/p/pandora/code/8163
Author:   ramonn
Date:     2013-05-20 11:20:39 +0000 (Mon, 20 May 2013)
Log Message:
-----------
2013-05-20  Ramon Novoa  <rnovoa@...>

	* util/pandora_xml_stress.pl,
	  util/pandora_xml_stress.conf: Added support for data attenuation on
	  certain days.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/util/pandora_xml_stress.conf
    trunk/pandora_server/util/pandora_xml_stress.pl

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-05-20 11:16:28 UTC (rev 8162)
+++ trunk/pandora_server/ChangeLog	2013-05-20 11:20:39 UTC (rev 8163)
@@ -1,3 +1,9 @@
+2013-05-20  Ramon Novoa  <rnovoa@...>
+
+	* util/pandora_xml_stress.pl,
+	  util/pandora_xml_stress.conf: Added support for data attenuation on
+	  certain days.
+
 2013-05-16  Ramon Novoa  <rnovoa@...>
 
 	* bin/pandora_server: Added information about the loading of the

Modified: trunk/pandora_server/util/pandora_xml_stress.conf
===================================================================
--- trunk/pandora_server/util/pandora_xml_stress.conf	2013-05-20 11:16:28 UTC (rev 8162)
+++ trunk/pandora_server/util/pandora_xml_stress.conf	2013-05-20 11:20:39 UTC (rev 8163)
@@ -1,4 +1,4 @@
-o Sample configuration file for pandora_xmlstress
+# Sample configuration file for pandora_xmlstress
 # (c) 2012, http://pandorafms.org
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -87,6 +87,8 @@
 module_unit conns
 module_min_critical 450
 module_min_warning 400
+module_attenuation 0.33
+module_attenuation_wdays 0 6
 module_end
 
 module_begin
@@ -104,6 +106,8 @@
 module_exec type=RANDOM;variation=50;min=0;max=1000000
 module_unit kbit/sec
 module_min_critical 900000
+module_attenuation 0.5
+module_attenuation_wdays 0 6
 module_end
 
 module_begin
@@ -113,6 +117,8 @@
 module_exec type=RANDOM;variation=50;min=0;max=1000000
 module_unit kbit/sec
 module_min_critical 900000
+module_attenuation 0.1
+module_attenuation_wdays 0 6
 module_end
 
 module_begin

Modified: trunk/pandora_server/util/pandora_xml_stress.pl
===================================================================
--- trunk/pandora_server/util/pandora_xml_stress.pl	2013-05-20 11:16:28 UTC (rev 8162)
+++ trunk/pandora_server/util/pandora_xml_stress.pl	2013-05-20 11:20:39 UTC (rev 8163)
@@ -137,7 +137,9 @@
 			my $ag_altitude = $altitude_base + (rand ($position_radius) - $position_radius/2)/100;
 			
 			# XML header
-			my $timestamp = strftime ("%Y-%m-%d %H:%M:%S", localtime ($utimestamp));
+			my @localtime = localtime ($utimestamp);
+			my $wday = $localtime[6];
+			my $timestamp = strftime ("%Y-%m-%d %H:%M:%S", @localtime);
 			my $xml_data = "<?xml version='$xml_version' encoding='$encoding'?>\n";
 			my $sign = int rand(2);
 			$ag_timezone_offset += ($sign*(-1)+(1-$sign)) * int rand($ag_timezone_offset_range);
@@ -152,6 +154,8 @@
 				my $module_type = get_conf_token ($module, 'module_type', 'generic_data');
 				my $module_description = get_conf_token ($module, 'module_description', '');
 				my $module_unit = get_conf_token ($module, 'module_unit', '');
+				my $attenuation = get_conf_token ($module, 'module_attenuation', '0');
+				my @attenuation_wdays = get_conf_token_array ($module, 'module_attenuation_wdays', ' ');
 				
 				#my $module_min = get_conf_token ($module, 'module_min', '0');
 				#my $module_max = get_conf_token ($module, 'module_max', '255');
@@ -237,6 +241,11 @@
 					
 				}
 				
+				# Data attenuation
+				if ($attenuation != 0 && ($#attenuation_wdays < 0 || $wday ~~ @attenuation_wdays)) {
+					$rnd_data *= $attenuation;
+				}
+				
 				# Save previous data
 				$module->{'module_data'} = $rnd_data;
 				$xml_data .= "\t\t<data><![CDATA[$rnd_data]]></data>\n";
@@ -449,6 +458,19 @@
 }
 
 ################################################################################
+# Returns the value of a configuration token.
+################################################################################
+sub get_conf_token_array ($$$) {
+	my ($hash_ref, $token, $separator) = @_;
+	
+	my @tokens = ();
+	return @tokens unless ref ($hash_ref) and defined ($hash_ref->{$token});
+	
+	@tokens = split($separator, $hash_ref->{$token});
+	return @tokens;
+}
+
+################################################################################
 # Returns the parameter of a generator configuration of module.
 ################################################################################
 sub get_generation_parameter($$$) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8172
          http://sourceforge.net/p/pandora/code/8172
Author:   ramonn
Date:     2013-05-20 19:01:35 +0000 (Mon, 20 May 2013)
Log Message:
-----------
2013-05-20  Ramon Novoa  <rnovoa@...>

	* util/pandora_xml_stress.pl: Added support for strictly incremental
	  modules.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/util/pandora_xml_stress.pl

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-05-20 16:43:28 UTC (rev 8171)
+++ trunk/pandora_server/ChangeLog	2013-05-20 19:01:35 UTC (rev 8172)
@@ -1,5 +1,10 @@
 2013-05-20  Ramon Novoa  <rnovoa@...>
 
+	* util/pandora_xml_stress.pl: Added support for strictly incremental
+	  modules.
+
+2013-05-20  Ramon Novoa  <rnovoa@...>
+
 	* util/pandora_xml_stress.pl,
 	  util/pandora_xml_stress.conf: Added support for data attenuation on
 	  certain days.

Modified: trunk/pandora_server/util/pandora_xml_stress.pl
===================================================================
--- trunk/pandora_server/util/pandora_xml_stress.pl	2013-05-20 16:43:28 UTC (rev 8171)
+++ trunk/pandora_server/util/pandora_xml_stress.pl	2013-05-20 19:01:35 UTC (rev 8172)
@@ -117,6 +117,9 @@
 	
 	my %modules_src_pointers = init_src_pointers($modules);
 	
+	# Previous data for incremental modules
+	my %prev_rnd_data;
+	
 	# Generate data files
 	my $utimestamp = $utimestamp_from;
 	while ($utimestamp <= $utimestamp_to) {
@@ -154,6 +157,7 @@
 				my $module_type = get_conf_token ($module, 'module_type', 'generic_data');
 				my $module_description = get_conf_token ($module, 'module_description', '');
 				my $module_unit = get_conf_token ($module, 'module_unit', '');
+				my $module_incremental = get_conf_token ($module, 'module_incremental', '0');
 				my $attenuation = get_conf_token ($module, 'module_attenuation', '0');
 				my @attenuation_wdays = get_conf_token_array ($module, 'module_attenuation_wdays', ' ');
 				
@@ -242,10 +246,18 @@
 				}
 				
 				# Data attenuation
-				if ($attenuation != 0 && ($#attenuation_wdays < 0 || $wday ~~ @attenuation_wdays)) {
+				if ($attenuation != 0 && ($#attenuation_wdays < 0 || grep{$_ eq $wday} @attenuation_wdays)) {
 					$rnd_data *= $attenuation;
 				}
 				
+				# Incremental module
+				if ($module_incremental == 1) {
+					if (defined ($prev_rnd_data{$module_name})) {
+						$rnd_data += $prev_rnd_data{$module_name};
+					}
+					$prev_rnd_data{$module_name} = $rnd_data;
+				}
+				
 				# Save previous data
 				$module->{'module_data'} = $rnd_data;
 				$xml_data .= "\t\t<data><![CDATA[$rnd_data]]></data>\n";

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8191
          http://sourceforge.net/p/pandora/code/8191
Author:   ramonn
Date:     2013-05-22 16:58:14 +0000 (Wed, 22 May 2013)
Log Message:
-----------
2013-05-22  Ramon Novoa  <rnovoa@...>

	* pandora_server.spec,
	  pandora_server.redhat.spec,
	  DEBIAN/postinst,
	  DEBIAN/conffiles,
	  DEBIAN/make_deb_package.sh,
	  conf/pandora_server.conf.new,
	  pandora_server_installer: Merged Sancho's changes from 4.0 branch.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/DEBIAN/make_deb_package.sh
    trunk/pandora_server/DEBIAN/postinst
    trunk/pandora_server/pandora_server.redhat.spec
    trunk/pandora_server/pandora_server.spec
    trunk/pandora_server/pandora_server_installer

Added Paths:
-----------
    trunk/pandora_server/conf/pandora_server.conf.new

Removed Paths:
-------------
    trunk/pandora_server/DEBIAN/conffiles
    trunk/pandora_server/conf/pandora_server.conf

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-05-22 15:08:24 UTC (rev 8190)
+++ trunk/pandora_server/ChangeLog	2013-05-22 16:58:14 UTC (rev 8191)
@@ -1,3 +1,13 @@
+2013-05-22  Ramon Novoa  <rnovoa@...>
+
+	* pandora_server.spec,
+	  pandora_server.redhat.spec,
+	  DEBIAN/postinst,
+	  DEBIAN/conffiles,
+	  DEBIAN/make_deb_package.sh,
+	  conf/pandora_server.conf.new,
+	  pandora_server_installer: Merged Sancho's changes from 4.0 branch.
+
 2013-05-20  Ramon Novoa  <rnovoa@...>
 
 	* util/pandora_xml_stress.pl: Added support for strictly incremental

Deleted: trunk/pandora_server/DEBIAN/conffiles
===================================================================
--- trunk/pandora_server/DEBIAN/conffiles	2013-05-22 15:08:24 UTC (rev 8190)
+++ trunk/pandora_server/DEBIAN/conffiles	2013-05-22 16:58:14 UTC (rev 8191)
@@ -1 +0,0 @@
-/etc/pandora/pandora_server.conf

Modified: trunk/pandora_server/DEBIAN/make_deb_package.sh
===================================================================
--- trunk/pandora_server/DEBIAN/make_deb_package.sh	2013-05-22 15:08:24 UTC (rev 8190)
+++ trunk/pandora_server/DEBIAN/make_deb_package.sh	2013-05-22 16:58:14 UTC (rev 8191)
@@ -68,7 +68,6 @@
 	mkdir -p temp_package/usr/sbin/
 	mkdir -p temp_package/etc/init.d/
 	mkdir -p temp_package/etc/pandora/
-	touch temp_package/etc/pandora/pandora_server.conf
 	mkdir -p temp_package/var/spool/pandora/data_in
 	chmod 770 temp_package/var/spool/pandora/data_in
 	mkdir -p temp_package/var/spool/pandora/data_in/conf

Modified: trunk/pandora_server/DEBIAN/postinst
===================================================================
--- trunk/pandora_server/DEBIAN/postinst	2013-05-22 15:08:24 UTC (rev 8190)
+++ trunk/pandora_server/DEBIAN/postinst	2013-05-22 16:58:14 UTC (rev 8191)
@@ -72,13 +72,13 @@
 mkdir /etc/pandora 2> /dev/null
 
 #Check if exist old conf file
-count_lines_conf=`cat /etc/pandora/pandora_server.conf | wc -l`
-
-if [ $count_lines_conf -eq 0 ]
+if [ ! -e /etc/pandora/pandora_server.conf ]
 then
-	rm /etc/pandora/pandora_server.conf
-	ln -s /usr/share/pandora_server/conf/pandora_server.conf /etc/pandora/
-	chmod 770 /etc/pandora/pandora_server.conf
+	cp /usr/share/pandora_server/conf/pandora_server.conf.new /etc/pandora/pandora_server.conf
+	chmod 600 /etc/pandora/pandora_server.conf
+else
+	cp /usr/share/pandora_server/conf/pandora_server.conf.new /etc/pandora/pandora_server.conf.new
+	echo "Skipping creation of pandora_server.conf: there is already one."
 fi
 
 echo "Linking startup script to /etc/rc2.d"

Deleted: trunk/pandora_server/conf/pandora_server.conf
===================================================================
--- trunk/pandora_server/conf/pandora_server.conf	2013-05-22 15:08:24 UTC (rev 8190)
+++ trunk/pandora_server/conf/pandora_server.conf	2013-05-22 16:58:14 UTC (rev 8191)
@@ -1,409 +0,0 @@
-#############################################################################
-# Pandora FMS Server Parameters
-# Pandora FMS, the Flexible Monitoring System.
-# Version 5.0dev
-# Licensed under GPL license v2,
-# (c) 2003-2013 Artica Soluciones Tecnologicas
-# http://www.pandorafms.com
-# Please change it for your setup needs
-#############################################################################
-
-# Servername: Name of this server
-# if not given, it takes hostname. It's preferable to setup one
-# because machine name could change by some reason.
-
-#servername adama
-
-# incomingdir:  Defines directory where incoming data packets are stored
-# You could set directory relative to base path or absolute, starting with /
-
-incomingdir /var/spool/pandora/data_in
-
-# log_file: Main logfile for pandora_server
-# You could set file relative to base path or absolute, starting with /
-
-log_file /var/log/pandora/pandora_server.log
-
-# Log file for Pandora FMS SNMP console. Its generated by NetSNMP Trap daemon
-
-snmp_logfile /var/log/pandora/pandora_snmptrap.log
-
-# Error logfile: aux logfile for pandora_server errors (in Daemon mode)
-# You could set file relative to base path or absolute, starting with /
-
-errorlog_file /var/log/pandora/pandora_server.error
-
-# daemon: Runs in daemon mode (background) if 1, if 0 runs in foreground 
-# this could be also configured on commandline with -D option
-
-# daemon 1
-
-# dbengine: mysql, postgresql or oracle (mysql by default)
-
-dbengine mysql
-
-# Database credentials. A VERY important configuration.
-# This must be the same credentials used by your Pandora FMS Console
-# but could be different if your console is not running in the same
-# host than the server. Check your console setup in /include/config.php
-
-# dbname: Database name (pandora by default)
-
-dbname pandora
-
-# dbuser:  Database user name (pandora by default)
-
-dbuser pandora
-
-# dbpass: Database password
-
-dbpass pandora
-
-# dbhost: Database hostname or IP address
-
-dbhost localhost
-
-# dbport: Database port number
-# Default value depends on the dbengine (mysql: 3306, postgresql: 5432, oracle: 1521)
-
-#dbport 3306
-
-# By default, parent agent will not update
-
-#update_parent 0
-
-# verbosity: level of detail on errors/messages (0 default, 1 verbose, 2 debug.... 10 noisy)
-# -v in command line (verbose) or -d (debug). Set this to 10 when try to locate problems and
-# set to 0 or 1 on production enviroments.
-
-verbosity 1
-
-# Master Server, 1 if master server (normal mode), 0 for slave mode (slave in multi-server setup)
-
-master 1
-
-# Activate Pandora SNMP console (depending on snmptrapd)
-
-snmpconsole 0
-
-# snmptrapd will ignore authenticationFailure traps if set to 1.
-
-snmp_ignore_authfailure 1
-
-# snmptrapd will read the PDU source address instead of the agent-addr field is set to 1.
-
-snmp_pdu_address 0
-
-# Activate (1) Pandora Network Server 
-
-networkserver 1
-
-# Activate (1) Pandora Data Server
-
-dataserver 1
-
-# Activate (1) Pandora FMS Recon server
-
-reconserver 1
-
-# pluginserver : 1 or 0. Set to 1 to activate plugin server with this setup
-
-pluginserver 1
-
-# Pandora FMS Plugin exec tool filepath (by default at /usr/bin)
-
-plugin_exec /usr/bin/timeout
-
-# predictionserver : 1 or 0. Set to 1 to activate prediction server with this setup
-# DISABLED BY DEFAULT 
-
-predictionserver 0
-
-# wmiserver : 1 or 0. Set to 1 to activate WMI server with this setup
-# DISABLED BY DEFAULT
-
-wmiserver 0
-
-# Network timeout (in seconds) for timeout in network connections for Network agents
-
-network_timeout 5
-
-# Server keepalive (in seconds)
-
-server_keepalive 45
-
-# Server Threshold: defines number of seconds of main loop (in sec)
-
-server_threshold 5
-
-# Network threads: Do not set too high (~40). Each threads make a network module check.
-
-network_threads 3
-
-# icmp_checks x : defines number of pings for each icmp_proc module type. at least one of 
-# that ping should be 1 to report 1
-
-icmp_checks 1
-
-# tcp specific options :
-# tcp_checks: number of tcp retries if first attempt fails.
-# tcp_timeout: specific timeout for tcp connections
-
-tcp_checks 1
-tcp_timeout 30
-
-# snmp specific options :
-# snmp_checks: number of snmp request retries if first attempt fails.
-# snmp_timeout: specific timeout for snmp request.
-
-snmp_checks 1
-snmp_timeout 5
-
-# snmp_proc_deadresponse 1 (default): Return DOWN if cannot contact 
-# or receive NULL from a SNMP PROC module.
-
-snmp_proc_deadresponse 1
-
-# plugin_threads: Specify number of plugin server threads for processing plugin calls
-
-plugin_threads 1
-
-# plugin_timeout: Specify number of seconds calling plugin exec waiting for response
-# after this time, call is aborted and result is "unknown".
-
-plugin_timeout 15
-
-# wmi_timeout : specific timeout for wmi request.
-
-wmi_timeout 10
-
-# wmi_threads: Specify number of WMI server threads for processing WMI remote calls
-
-wmi_threads 1
-
-# recon_threads. Each thread will scan a different scantask.
-
-recon_threads 1
-
-# dataserver_threads: Number of threads for data server (XML processing threads)
-
-dataserver_threads 1
-
-# mta_address: External Mailer (MTA) IP Address to be used by Pandora FMS internal email capabilities
-
-mta_address localhost
-
-# mta_port, this is the mail server port (default 25)
-
-#mta_port 25
-
-# mta_user MTA User (if needed for auth, FQD or simple user, depending on your server)
-
-#mta_user myuser@...
-
-# mta_pass MTA Pass (if needed for auth)
-
-#mta_pass mypassword
-
-# mta_auth MTA Auth system (if needed, it supports LOGIN, PLAIN, CRAM-MD5, DIGEST-MD)
-
-#mta_auth LOGIN
-
-# mta_from Email address that sends the mail, by default is pandora@... 
-#           probably you need to change it to avoid problems with your antispam
-
-#mta_from Pandora FMS <pandora@...>
-
-# xprobe2: Optional package to detect OS types using advanced TCP/IP 
-# fingerprinting tecniques, much more accurates than stadard nmap.
-# If not provided, nmap is used insted xprobe2
-
-xprobe2 /usr/bin/xprobe2
-
-# nmap: If provided, is used to detect OS type with recon server using 
-# advanded OS fingerprint technique. Xprobe2 gives more accurate results
-# Nmap is also used to do TCP port scanning in detected host.
-
-nmap /usr/bin/nmap
-
-# snmpget: Needed to do SNMP checks. By default is on /usr/bin/snmpget
-
-snmpget /usr/bin/snmpget
-
-# Location of the braa binary needed by the Enterprise SNMP Server (/usr/bin/braa by default) (PANDORA FMS ENTERPRISE ONLY).
-
-braa /usr/bin/braa
-
-# Number of retries before braa hands a module over to the Network Server (PANDORA FMS ENTERPRISE ONLY).
-
-braa_retries 3
-
-# Default group id for new agents created with Pandora FMS Data Server
-
-autocreate_group 2
-
-# Set to 1 if want to autocreate agents with Pandora FMS Data Server, 
-# set to 0 to disable
-
-autocreate 1
-
-# max_log_size: Specify max size of Pandora FMS server log file (1MB by default). If
-# log file grows above this limit, is renamed to "pandora_server.log.old".
-
-max_log_size 65536
-
-# max_queue_files (500 by default)
-# When server have more than max_queue_files in incoming directory, skips the read   
-# the directory to avoid filesystem overhead.
-
-max_queue_files 500
-
-# Use the XML file last modification time as timestamp.
-
-# use_xml_timestamp 1
-
-# Pandora FMS will autorestart itself each XXX seconds, use this if you experience problems with 
-# shutting down threads, or other stability problems.
-
-# auto_restart 86400
-
-# Pandora FMS will restart after restart_delay seconds on critical errors.
-
-# restart 0
-# restart_delay 60
-
-# More information about GIS Setup in /usr/share/pandora_server/util/gis.README
-# Flag to activate GIS (positional information for agents and maps) 
-# by default it is desactivated
-
-#activate_gis 0
-
-# Radius of error in meters to consider two gis locations as the same location.
-
-#location_error 50
-
-# Recon reverse geolocation mode [disabled, sql, file]
-#   disabled    The recon task doesn't try to geolocate the ip discovered.
-#   sql         The recon task trys to query the SQL database to geolocate the 
-#               ip discovered
-#   file        The recon task trys to find the geolocation information of the 
-#               ip discovered in the file indicated in the 
-#                recon_reverse_geolocation_file parameter 
-
-# recon_reverse_geolocation_mode disabled
-
-# Recon reverse geolocation file. This is the database with the reverse 
-# geolocation information using MaxMind GPL GeoLiteCity.dat format).
-
-#recon_reverse_geolocation_file /usr/local/share/GeoIP/GeoIPCity.dat
-
-# Radius (in meters) of the circle in where the agents will be place randomly 
-# when finded by a recon task. Center of the circle is guessed 
-# by geolocating the IP.
-
-#recon_location_scatter_radius 1000
-
-# Pandora Server self-monitoring (embedded agent) (by default enabled)
-
-self_monitoring 1
-
-# Update parent from the agent xml
-
-#update_parent 1
-#
-#
-# This enable realtime reverse geocoding using Google Maps public api.
-# This requires internet access, and could have performance penalties processing GIS
-# information due the connetion needed to resolve all GIS input.
-# NOTE: If you dont pay the service to google, they will ban your IP in a few days.
-
-# google_maps_description 1
-
-# This enable realtime reverse geocoding using Openstreet Maps public api.
-# This requires internet access, and could have performance penalties processing GIS
-# information due the connetion needed to resolve all GIS input.
-# You can alter the code to use a local (your own) openstreet maps server.
-
-# openstreetmaps_description 1
-
-# Enable (1) or disable (0) Pandora FMS Event Web Server (PANDORA FMS ENTERPRISE ONLY).
-
-webserver 1
-
-# Number of threads for the Web Server (PANDORA FMS ENTERPRISE ONLY).
-
-web_threads 1
-
-# Enable (1) or disable (0) Pandora FMS Inventory Server (PANDORA FMS ENTERPRISE ONLY).
-
-inventoryserver 1
-
-# Number of threads for the Web Server (PANDORA FMS ENTERPRISE ONLY).
-
-inventory_threads 1
-
-# Enable (1) or disable (0) Pandora FMS Export Server (PANDORA FMS ENTERPRISE ONLY).
-
-exportserver 0
-
-# Number of threads for the Export Server (PANDORA FMS ENTERPRISE ONLY).
-
-export_threads 1
-
-# Enable (1) or disable (0) Pandora FMS Event Server (PANDORA FMS ENTERPRISE ONLY).
-
-eventserver 0
-
-# Event Server event window in seconds (3600 by default) (PANDORA FMS ENTERPRISE ONLY).
-
-event_window 3600
-
-# Enable (1) or disable (0) Pandora FMS Enterprise ICMP Server (PANDORA FMS ENTERPRISE ONLY).
-# You need nmap 5.20 or higher in order to use this !
-
-icmpserver 0
-
-# Number of threads for the Enterprise ICMP Server (PANDORA FMS ENTERPRISE ONLY).
-
-icmp_threads 2
-
-# Enable (1) or disable (0) Pandora FMS Enterprise SNMP Server (PANDORA FMS ENTERPRISE ONLY).
-# Check braa tool is running and operative.
-
-snmpserver 0
-
-# Number of threads for the Enterprise SNMP Server (PANDORA FMS ENTERPRISE ONLY).
-
-snmp_threads 2
-
-# Block size for block producer/consumer servers, that is, the number of modules
-# per block (15 by default) (PANDORA FMS ENTERPRISE ONLY).
-
-block_size 15
-
-# Enable (1) or disable (0) Pandora FMS Netflow Server.
-# You need to install package nfcapd before try to use this feature.
-
-netflowserver 1
-
-# If set to 1, process XML data files in a stack instead of a queue. 0 by default.
-# WARNING: Incremental modules will not work properly if dataserver_lifo is set to 1!!!
-
-dataserver_lifo 0
-
-# If set to 1, the policy manager is enabled and the server is listening the policy queue. 
-# 0 by default (PANDORA FMS ENTERPRISE ONLY) 
-
-policy_manager 0
-
-# If set to 1, the event replicate process is enabled. 0 by default. (PANDORA FMS ENTERPRISE ONLY) 
-# WARNING: This process doesn't do anything if is not properly configured from the console setup 
-
-event_replication 0
-
-# If set to 1, new events validate older event for the same module. This will
-# affect the performance of the server. This was the "normal behaviour" on previous (4.x) versions.
-# disable only if you really know what you are doing !!.
-
-event_auto_validation 1
-

Copied: trunk/pandora_server/conf/pandora_server.conf.new (from rev 8160, trunk/pandora_server/conf/pandora_server.conf)
===================================================================
--- trunk/pandora_server/conf/pandora_server.conf.new	                        (rev 0)
+++ trunk/pandora_server/conf/pandora_server.conf.new	2013-05-22 16:58:14 UTC (rev 8191)
@@ -0,0 +1,409 @@
+#############################################################################
+# Pandora FMS Server Parameters
+# Pandora FMS, the Flexible Monitoring System.
+# Version 5.0dev
+# Licensed under GPL license v2,
+# (c) 2003-2013 Artica Soluciones Tecnologicas
+# http://www.pandorafms.com
+# Please change it for your setup needs
+#############################################################################
+
+# Servername: Name of this server
+# if not given, it takes hostname. It's preferable to setup one
+# because machine name could change by some reason.
+
+#servername adama
+
+# incomingdir:  Defines directory where incoming data packets are stored
+# You could set directory relative to base path or absolute, starting with /
+
+incomingdir /var/spool/pandora/data_in
+
+# log_file: Main logfile for pandora_server
+# You could set file relative to base path or absolute, starting with /
+
+log_file /var/log/pandora/pandora_server.log
+
+# Log file for Pandora FMS SNMP console. Its generated by NetSNMP Trap daemon
+
+snmp_logfile /var/log/pandora/pandora_snmptrap.log
+
+# Error logfile: aux logfile for pandora_server errors (in Daemon mode)
+# You could set file relative to base path or absolute, starting with /
+
+errorlog_file /var/log/pandora/pandora_server.error
+
+# daemon: Runs in daemon mode (background) if 1, if 0 runs in foreground 
+# this could be also configured on commandline with -D option
+
+# daemon 1
+
+# dbengine: mysql, postgresql or oracle (mysql by default)
+
+dbengine mysql
+
+# Database credentials. A VERY important configuration.
+# This must be the same credentials used by your Pandora FMS Console
+# but could be different if your console is not running in the same
+# host than the server. Check your console setup in /include/config.php
+
+# dbname: Database name (pandora by default)
+
+dbname pandora
+
+# dbuser:  Database user name (pandora by default)
+
+dbuser pandora
+
+# dbpass: Database password
+
+dbpass pandora
+
+# dbhost: Database hostname or IP address
+
+dbhost localhost
+
+# dbport: Database port number
+# Default value depends on the dbengine (mysql: 3306, postgresql: 5432, oracle: 1521)
+
+#dbport 3306
+
+# By default, parent agent will not update
+
+#update_parent 0
+
+# verbosity: level of detail on errors/messages (0 default, 1 verbose, 2 debug.... 10 noisy)
+# -v in command line (verbose) or -d (debug). Set this to 10 when try to locate problems and
+# set to 0 or 1 on production enviroments.
+
+verbosity 1
+
+# Master Server, 1 if master server (normal mode), 0 for slave mode (slave in multi-server setup)
+
+master 1
+
+# Activate Pandora SNMP console (depending on snmptrapd)
+
+snmpconsole 0
+
+# snmptrapd will ignore authenticationFailure traps if set to 1.
+
+snmp_ignore_authfailure 1
+
+# snmptrapd will read the PDU source address instead of the agent-addr field is set to 1.
+
+snmp_pdu_address 0
+
+# Activate (1) Pandora Network Server 
+
+networkserver 1
+
+# Activate (1) Pandora Data Server
+
+dataserver 1
+
+# Activate (1) Pandora FMS Recon server
+
+reconserver 1
+
+# pluginserver : 1 or 0. Set to 1 to activate plugin server with this setup
+
+pluginserver 1
+
+# Pandora FMS Plugin exec tool filepath (by default at /usr/bin)
+
+plugin_exec /usr/bin/timeout
+
+# predictionserver : 1 or 0. Set to 1 to activate prediction server with this setup
+# DISABLED BY DEFAULT 
+
+predictionserver 0
+
+# wmiserver : 1 or 0. Set to 1 to activate WMI server with this setup
+# DISABLED BY DEFAULT
+
+wmiserver 0
+
+# Network timeout (in seconds) for timeout in network connections for Network agents
+
+network_timeout 5
+
+# Server keepalive (in seconds)
+
+server_keepalive 45
+
+# Server Threshold: defines number of seconds of main loop (in sec)
+
+server_threshold 5
+
+# Network threads: Do not set too high (~40). Each threads make a network module check.
+
+network_threads 3
+
+# icmp_checks x : defines number of pings for each icmp_proc module type. at least one of 
+# that ping should be 1 to report 1
+
+icmp_checks 1
+
+# tcp specific options :
+# tcp_checks: number of tcp retries if first attempt fails.
+# tcp_timeout: specific timeout for tcp connections
+
+tcp_checks 1
+tcp_timeout 30
+
+# snmp specific options :
+# snmp_checks: number of snmp request retries if first attempt fails.
+# snmp_timeout: specific timeout for snmp request.
+
+snmp_checks 1
+snmp_timeout 5
+
+# snmp_proc_deadresponse 1 (default): Return DOWN if cannot contact 
+# or receive NULL from a SNMP PROC module.
+
+snmp_proc_deadresponse 1
+
+# plugin_threads: Specify number of plugin server threads for processing plugin calls
+
+plugin_threads 1
+
+# plugin_timeout: Specify number of seconds calling plugin exec waiting for response
+# after this time, call is aborted and result is "unknown".
+
+plugin_timeout 15
+
+# wmi_timeout : specific timeout for wmi request.
+
+wmi_timeout 10
+
+# wmi_threads: Specify number of WMI server threads for processing WMI remote calls
+
+wmi_threads 1
+
+# recon_threads. Each thread will scan a different scantask.
+
+recon_threads 1
+
+# dataserver_threads: Number of threads for data server (XML processing threads)
+
+dataserver_threads 1
+
+# mta_address: External Mailer (MTA) IP Address to be used by Pandora FMS internal email capabilities
+
+mta_address localhost
+
+# mta_port, this is the mail server port (default 25)
+
+#mta_port 25
+
+# mta_user MTA User (if needed for auth, FQD or simple user, depending on your server)
+
+#mta_user myuser@...
+
+# mta_pass MTA Pass (if needed for auth)
+
+#mta_pass mypassword
+
+# mta_auth MTA Auth system (if needed, it supports LOGIN, PLAIN, CRAM-MD5, DIGEST-MD)
+
+#mta_auth LOGIN
+
+# mta_from Email address that sends the mail, by default is pandora@... 
+#           probably you need to change it to avoid problems with your antispam
+
+#mta_from Pandora FMS <pandora@...>
+
+# xprobe2: Optional package to detect OS types using advanced TCP/IP 
+# fingerprinting tecniques, much more accurates than stadard nmap.
+# If not provided, nmap is used insted xprobe2
+
+xprobe2 /usr/bin/xprobe2
+
+# nmap: If provided, is used to detect OS type with recon server using 
+# advanded OS fingerprint technique. Xprobe2 gives more accurate results
+# Nmap is also used to do TCP port scanning in detected host.
+
+nmap /usr/bin/nmap
+
+# snmpget: Needed to do SNMP checks. By default is on /usr/bin/snmpget
+
+snmpget /usr/bin/snmpget
+
+# Location of the braa binary needed by the Enterprise SNMP Server (/usr/bin/braa by default) (PANDORA FMS ENTERPRISE ONLY).
+
+braa /usr/bin/braa
+
+# Number of retries before braa hands a module over to the Network Server (PANDORA FMS ENTERPRISE ONLY).
+
+braa_retries 3
+
+# Default group id for new agents created with Pandora FMS Data Server
+
+autocreate_group 2
+
+# Set to 1 if want to autocreate agents with Pandora FMS Data Server, 
+# set to 0 to disable
+
+autocreate 1
+
+# max_log_size: Specify max size of Pandora FMS server log file (1MB by default). If
+# log file grows above this limit, is renamed to "pandora_server.log.old".
+
+max_log_size 65536
+
+# max_queue_files (500 by default)
+# When server have more than max_queue_files in incoming directory, skips the read   
+# the directory to avoid filesystem overhead.
+
+max_queue_files 500
+
+# Use the XML file last modification time as timestamp.
+
+# use_xml_timestamp 1
+
+# Pandora FMS will autorestart itself each XXX seconds, use this if you experience problems with 
+# shutting down threads, or other stability problems.
+
+# auto_restart 86400
+
+# Pandora FMS will restart after restart_delay seconds on critical errors.
+
+# restart 0
+# restart_delay 60
+
+# More information about GIS Setup in /usr/share/pandora_server/util/gis.README
+# Flag to activate GIS (positional information for agents and maps) 
+# by default it is desactivated
+
+#activate_gis 0
+
+# Radius of error in meters to consider two gis locations as the same location.
+
+#location_error 50
+
+# Recon reverse geolocation mode [disabled, sql, file]
+#   disabled    The recon task doesn't try to geolocate the ip discovered.
+#   sql         The recon task trys to query the SQL database to geolocate the 
+#               ip discovered
+#   file        The recon task trys to find the geolocation information of the 
+#               ip discovered in the file indicated in the 
+#                recon_reverse_geolocation_file parameter 
+
+# recon_reverse_geolocation_mode disabled
+
+# Recon reverse geolocation file. This is the database with the reverse 
+# geolocation information using MaxMind GPL GeoLiteCity.dat format).
+
+#recon_reverse_geolocation_file /usr/local/share/GeoIP/GeoIPCity.dat
+
+# Radius (in meters) of the circle in where the agents will be place randomly 
+# when finded by a recon task. Center of the circle is guessed 
+# by geolocating the IP.
+
+#recon_location_scatter_radius 1000
+
+# Pandora Server self-monitoring (embedded agent) (by default enabled)
+
+self_monitoring 1
+
+# Update parent from the agent xml
+
+#update_parent 1
+#
+#
+# This enable realtime reverse geocoding using Google Maps public api.
+# This requires internet access, and could have performance penalties processing GIS
+# information due the connetion needed to resolve all GIS input.
+# NOTE: If you dont pay the service to google, they will ban your IP in a few days.
+
+# google_maps_description 1
+
+# This enable realtime reverse geocoding using Openstreet Maps public api.
+# This requires internet access, and could have performance penalties processing GIS
+# information due the connetion needed to resolve all GIS input.
+# You can alter the code to use a local (your own) openstreet maps server.
+
+# openstreetmaps_description 1
+
+# Enable (1) or disable (0) Pandora FMS Event Web Server (PANDORA FMS ENTERPRISE ONLY).
+
+webserver 1
+
+# Number of threads for the Web Server (PANDORA FMS ENTERPRISE ONLY).
+
+web_threads 1
+
+# Enable (1) or disable (0) Pandora FMS Inventory Server (PANDORA FMS ENTERPRISE ONLY).
+
+inventoryserver 1
+
+# Number of threads for the Web Server (PANDORA FMS ENTERPRISE ONLY).
+
+inventory_threads 1
+
+# Enable (1) or disable (0) Pandora FMS Export Server (PANDORA FMS ENTERPRISE ONLY).
+
+exportserver 0
+
+# Number of threads for the Export Server (PANDORA FMS ENTERPRISE ONLY).
+
+export_threads 1
+
+# Enable (1) or disable (0) Pandora FMS Event Server (PANDORA FMS ENTERPRISE ONLY).
+
+eventserver 0
+
+# Event Server event window in seconds (3600 by default) (PANDORA FMS ENTERPRISE ONLY).
+
+event_window 3600
+
+# Enable (1) or disable (0) Pandora FMS Enterprise ICMP Server (PANDORA FMS ENTERPRISE ONLY).
+# You need nmap 5.20 or higher in order to use this !
+
+icmpserver 0
+
+# Number of threads for the Enterprise ICMP Server (PANDORA FMS ENTERPRISE ONLY).
+
+icmp_threads 2
+
+# Enable (1) or disable (0) Pandora FMS Enterprise SNMP Server (PANDORA FMS ENTERPRISE ONLY).
+# Check braa tool is running and operative.
+
+snmpserver 0
+
+# Number of threads for the Enterprise SNMP Server (PANDORA FMS ENTERPRISE ONLY).
+
+snmp_threads 2
+
+# Block size for block producer/consumer servers, that is, the number of modules
+# per block (15 by default) (PANDORA FMS ENTERPRISE ONLY).
+
+block_size 15
+
+# Enable (1) or disable (0) Pandora FMS Netflow Server.
+# You need to install package nfcapd before try to use this feature.
+
+netflowserver 1
+
+# If set to 1, process XML data files in a stack instead of a queue. 0 by default.
+# WARNING: Incremental modules will not work properly if dataserver_lifo is set to 1!!!
+
+dataserver_lifo 0
+
+# If set to 1, the policy manager is enabled and the server is listening the policy queue. 
+# 0 by default (PANDORA FMS ENTERPRISE ONLY) 
+
+policy_manager 0
+
+# If set to 1, the event replicate process is enabled. 0 by default. (PANDORA FMS ENTERPRISE ONLY) 
+# WARNING: This process doesn't do anything if is not properly configured from the console setup 
+
+event_replication 0
+
+# If set to 1, new events validate older event for the same module. This will
+# affect the performance of the server. This was the "normal behaviour" on previous (4.x) versions.
+# disable only if you really know what you are doing !!.
+
+event_auto_validation 1
+

Modified: trunk/pandora_server/pandora_server.redhat.spec
===================================================================
--- trunk/pandora_server/pandora_server.redhat.spec	2013-05-22 15:08:24 UTC (rev 8190)
+++ trunk/pandora_server/pandora_server.redhat.spec	2013-05-22 16:58:14 UTC (rev 8191)
@@ -76,7 +76,7 @@
 rm -f $RPM_BUILD_ROOT%{prefix}/pandora_server/util/recon_scripts/PandoraFMS
 
 install -m 0644 util/pandora_logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/pandora_server
-install -m 0640 conf/pandora_server.conf $RPM_BUILD_ROOT%{_sysconfdir}/pandora/
+install -m 0640 conf/pandora_server.conf.new $RPM_BUILD_ROOT%{_sysconfdir}/pandora/pandora_server.conf.new
 
 cat <<EOF > $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/pandora_db
 #!/bin/bash
@@ -91,11 +91,6 @@
 getent passwd pandora >/dev/null || \
     /usr/sbin/useradd -d %{prefix}/pandora_server -s /sbin/nologin -M -g 0 pandora
 
-if [ -e "/etc/pandora/pandora_server.conf" ]
-then
-	cat /etc/pandora/pandora_server.conf > /etc/pandora/pandora_server.conf.old
-fi
-
 exit 0
 
 %post
@@ -113,6 +108,18 @@
    echo " "
 fi
 
+# This will avoid pandora_server.conf overwritting on UPGRADES.
+
+if [ ! -e "/etc/pandora/pandora_server.conf" ]
+then
+        echo "Creating a new version of Pandora FMS Server config file at /etc/pandora/pandora_server.conf"
+        cat /etc/pandora/pandora_server.conf.new > /etc/pandora/pandora_server.conf
+else
+        # Do a copy of current .conf, just in case.
+        echo "An existing version of pandora_server.conf is found."
+        cat /etc/pandora/pandora_server.conf > /etc/pandora/pandora_server.conf.old
+fi
+
 echo "Don't forget to start Tentacle Server daemon if you want to receive"
 echo "data using tentacle"
 
@@ -151,9 +158,11 @@
 %{_bindir}/tentacle_server
 %dir %{_localstatedir}/log/pandora
 %dir %{_sysconfdir}/pandora
-%config(noreplace) %{_sysconfdir}/pandora/pandora_server.conf
 %dir %{_localstatedir}/spool/pandora
 
+%defattr(600,root,root)
+/etc/pandora/pandora_server.conf.new
+
 %defattr(770,pandora,apache)
 %{_localstatedir}/spool/pandora/data_in
 

Modified: trunk/pandora_server/pandora_server.spec
===================================================================
--- trunk/pandora_server/pandora_server.spec	2013-05-22 15:08:24 UTC (rev 8190)
+++ trunk/pandora_server/pandora_server.spec	2013-05-22 16:58:14 UTC (rev 8191)
@@ -80,8 +80,8 @@
 cp -aRf man/man1/pandora_server.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/
 cp -aRf man/man1/tentacle_server.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/
 
-rm -f $RPM_BUILD_ROOT%{prefix}/pandora_server/util/PandoraFMS
-rm -f $RPM_BUILD_ROOT%{prefix}/pandora_server/util/recon_scripts/PandoraFMS
+rm -Rf $RPM_BUILD_ROOT%{prefix}/pandora_server/util/PandoraFMS
+rm -Rf $RPM_BUILD_ROOT%{prefix}/pandora_server/util/recon_scripts/PandoraFMS
 
 %clean
 rm -fr $RPM_BUILD_ROOT
@@ -91,12 +91,8 @@
 then
 	/usr/sbin/useradd -d %{prefix}/pandora -s /bin/false -M -g 0 pandora
 fi
+exit 0
 
-if [ -e "/etc/pandora/pandora_server.conf" ]
-then
-	cat /etc/pandora/pandora_server.conf > /etc/pandora/pandora_server.conf.old
-fi
-
 %post
 chkconfig pandora_server on 
 chkconfig tentacle_serverd on 
@@ -109,18 +105,21 @@
    mkdir -p /etc/pandora
 fi
 
-if [ ! -e /etc/pandora/pandora_server.conf ] ; then
-   ln -s /usr/share/pandora_server/conf/pandora_server.conf /etc/pandora/
-   echo "Pandora FMS Server configuration is /etc/pandora/pandora_server.conf"
-   echo "Pandora FMS Server main directory is %{prefix}/pandora_server/"
-   echo "The manual can be reached at: man pandora or man pandora_server"
-   echo "Pandora FMS Documentation is in: http://pandorafms.org"
-   echo " "
+if [ ! -e "/etc/pandora/pandora_server.conf" ]
+then
+        echo "Creating a new version of Pandora FMS Server config file at /etc/pandora/pandora_server.conf"
+        cat /etc/pandora/pandora_server.conf.new > /etc/pandora/pandora_server.conf
+else
+        # Do a copy of current .conf, just in case.
+        echo "An existing version of pandora_server.conf is found."
+        cat /etc/pandora/pandora_server.conf > /etc/pandora/pandora_server.conf.old
 fi
 
 echo "Don't forget to start Tentacle Server daemon if you want to receive"
 echo "data using tentacle"
 
+exit 0
+
 %preun
 
 # Upgrading
@@ -145,7 +144,7 @@
 rm -Rf %{prefix}pandora_server
 rm -Rf /var/log/pandora
 rm -Rf /usr/lib/perl5/PandoraFMS/
-rm -Rf /etc/pandora/pandora_server.conf
+rm -Rf /etc/pandora/pandora_server.conf*
 rm -Rf /var/spool/pandora
 rm -Rf /etc/init.d/pandora_server /etc/init.d/tentacle_serverd 
 rm -Rf /usr/bin/pandora_exec /usr/bin/pandora_server /usr/bin/tentacle_server

Modified: trunk/pandora_server/pandora_server_installer
===================================================================
--- trunk/pandora_server/pandora_server_installer	2013-05-22 15:08:24 UTC (rev 8190)
+++ trunk/pandora_server/pandora_server_installer	2013-05-22 16:58:14 UTC (rev 8191)
@@ -297,8 +297,8 @@
 			echo cp NetBSD/pandora_server.conf $PANDORA_CFG_DIR
 			cp NetBSD/pandora_server.conf $PANDORA_CFG_DIR     
 		else
-			echo cp conf/pandora_server.conf $PANDORA_CFG_DIR
-			cp conf/pandora_server.conf $PANDORA_CFG_DIR
+			echo cp conf/pandora_server.conf.new $PANDORA_CFG_DIR
+			cp conf/pandora_server.conf.new $PANDORA_CFG_DIR
 		fi
 		chmod 770 $PANDORA_CFG_FILE
 
@@ -549,6 +549,7 @@
 
 	rm -Rf $PANDORA_LOG 2> /dev/null 
 	rm -Rf $PANDORA_CFG_FILE 2> /dev/null
+	rm -Rf "$PANDORA_CFG_FILE.new" 2> /dev/null
 	rm -Rf $PANDORA_SERVER 2> /dev/null 
 	rm -Rf /usr/bin/pandora_server 2> /dev/null
 	rm -Rf /usr/bin/pandora_exec 2> /dev/null

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8193
          http://sourceforge.net/p/pandora/code/8193
Author:   slerena
Date:     2013-05-23 00:54:35 +0000 (Thu, 23 May 2013)
Log Message:
-----------
2013-05-23  Sancho Lerena <slerena@...>

        * util/pandora_logrotate: Fixed several problems due rotation.
        Now there is no need to restart any process, much safer.
        Added correct paths for pandora console log on centos and debian.

Modified Paths:
--------------
    trunk/pandora_server/ChangeLog
    trunk/pandora_server/util/pandora_logrotate

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog	2013-05-23 00:53:34 UTC (rev 8192)
+++ trunk/pandora_server/ChangeLog	2013-05-23 00:54:35 UTC (rev 8193)
@@ -1,3 +1,9 @@
+2013-05-23  Sancho Lerena <slerena@...>
+
+        * util/pandora_logrotate: Fixed several problems due rotation.
+        Now there is no need to restart any process, much safer.
+        Added correct paths for pandora console log on centos and debian.
+
 2013-05-22  Ramon Novoa  <rnovoa@...>
 
 	* pandora_server.spec,

Modified: trunk/pandora_server/util/pandora_logrotate
===================================================================
--- trunk/pandora_server/util/pandora_logrotate	2013-05-23 00:53:34 UTC (rev 8192)
+++ trunk/pandora_server/util/pandora_logrotate	2013-05-23 00:54:35 UTC (rev 8193)
@@ -3,21 +3,27 @@
 /var/log/pandora/pandora_server.error {
 	weekly
 	missingok
-	size 128144
+	size 300000
 	rotate 3
-	maxage 15
+	maxage 90
 	compress
 	notifempty
-	create 644 root root
-	sharedscripts
-	postrotate
-	/etc/init.d/pandora_server restart
-	endscript
+        copytruncate
 }
 
-# Only for SUSE / DEBIAN / UBUNTU 
+# DEBIAN / UBUNTU 
+/var/www/pandora_console/pandora_console.log {
+	weekly
+        missingok
+        size 100000
+        rotate 3
+        maxage 15
+        compress
+        notifempty
+        create 644 www-data www-data
+}
 
-/var/www/pandora_console 
+# OpenSUSE, SLES
 /srv/www/htdocs/pandora_console/pandora_console.log {
 	weekly
 	missingok
@@ -29,17 +35,24 @@
 	create 644 wwwrun www
 }
 
+# Centos, Redhat, Fedora
+/var/www/html/pandora_console/pandora_console.log {
+        weekly
+        missingok
+        size 100000
+        rotate 3
+        maxage 15
+        compress
+        notifempty
+        create 644 apache root
+}
+
 /var/log/pandora/pandora_snmptrap.log {
 	weekly
 	missingok
 	size 500000
 	rotate 1
-	maxage 365
+	maxage 30
 	notifempty
-	create 664 root root
-        postrotate
-	rm /var/log/pandora/pandora_snmptrap.log.index 2> /dev/null
-        /etc/init.d/pandora_server restart
-        endscript
-
+	copytruncate
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.