Merge branch 'develop' into ipmi-recon

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 6.0dev-150525
+Version: 6.0dev-150527
 Architecture: all
 Priority: optional
 Section: admin

pandora_agents/unix/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="6.0dev-150525"
+pandora_version="6.0dev-150527"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

pandora_agents/unix/pandora_agent

@@ -41,7 +41,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '6.0dev';
-use constant AGENT_BUILD => '150525';
+use constant AGENT_BUILD => '150527';
 
 # Commands to retrieve total memory information in kB
 use constant TOTALMEMORY_CMDS => {

pandora_agents/unix/pandora_agent.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     6.0dev
-%define release     150525
+%define release     150527
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     6.0dev
-%define release     150525
+%define release     150527
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{150525}
+{150527}
 
 ViewReadme
 {Yes}

pandora_agents/win32/pandora.cc

@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("6.0dev(Build 150525)")
+#define PANDORA_VERSION ("6.0dev(Build 150527)")
 
 string pandora_path;
 string pandora_dir;

pandora_agents/win32/versioninfo.rc

@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(6.0dev(Build 150525))"
+      VALUE "ProductVersion", "(6.0dev(Build 150527))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 6.0dev-150525
+Version: 6.0dev-150527
 Architecture: all
 Priority: optional
 Section: admin

pandora_console/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="6.0dev-150525"
+pandora_version="6.0dev-150527"
 
 package_pear=0
 package_pandora=1

pandora_console/include/ajax/visual_console_builder.ajax.php

@@ -508,6 +508,9 @@ switch ($action) {
 						break;
 					default:
 						if (enterprise_installed()) {
+							if ($image !== null) {
+								$values['image'] = $image;
+							}
 							enterprise_ajax_update_values($action, $type, $values);
 						}
 						break;

pandora_console/include/config_process.php

@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC150525';
+$build_version = 'PC150527';
 $pandora_version = 'v6.0dev';
 
 // Do not overwrite default timezone set if defined.

pandora_console/include/functions.php

@@ -464,29 +464,19 @@ function human_time_description_raw ($seconds, $exactly = false, $units = 'large
 			$returnTime .= "$hours $hoursString ";
 		}
 		
-		$mins = floor($seconds / SECONDS_1MINUTE);
+		$mins = floor($seconds / 60);
 		
 		if ($mins != 0) {
-			$seconds = $seconds - ($mins * SECONDS_1MINUTE);
+			$seconds = $seconds - ($mins * 60);
+			
+			$returnTime .= "$mins $minutesString ";
 			
-			if ($hours == 0) {
-				$returnTime .= "$mins $minutesString ";
-			}
-			else {
-				$returnTime = sprintf("%02d",$hours) . ':' .
-					sprintf("%02d",$mins);
-			}
 		}
 		
+		$seconds = (int) $seconds;
+		
 		if ($seconds != 0) {
-			if ($hours == 0) {
-				$returnTime .= "$seconds $secondsString ";
-			}
-			else {
-				$returnTime = sprintf("%02d",$hours) . ':' .
-					sprintf("%02d",$mins) . ':' .
-					sprintf("%02d",$seconds);
-			}
+			$returnTime .= "$seconds $secondsString ";
 		}
 		
 		$return = ' ';

pandora_console/include/functions_config.php

@@ -1458,7 +1458,7 @@ function config_check () {
 		}
 		if ($_SESSION['new_update'] == 'new') {
 			set_pandora_error_for_header(
-				__('There is a new update please go to menu Administration and into extensions <a style="font-weight:bold;" href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=online">go to Update Manager</a> for more details.'),
+				__('There is a new update available. Please<a style="font-weight:bold;" href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=online"> go to Administration:Setup:Update Manager</a> for more details.'),
 				__("New update of Pandora Console"));
 		}
 	}

pandora_console/include/functions_modules.php

@@ -2141,14 +2141,8 @@ function modules_get_count_datas($id_agent_module, $date_init, $date_end) {
 	return ($diff / $interval);
 }
 
-function modules_get_data_with_value($id_agent_module, $date_init,
-	$date_end, $value, $split_interval = false) {
-	
-	global $config;
-	
-	// TODO REMOVE THE TIME IN PLANNED DOWNTIME
-	
-	// TODO FOR OTHER KIND OF DATA
+function modules_get_count_data_with_value($id_agent_module, $date_init,
+	$date_end, $value) {
 	
 	if (!is_numeric($date_init)) {
 		$date_init = strtotime($date_init);
@@ -2158,58 +2152,50 @@ function modules_get_data_with_value($id_agent_module, $date_init,
 		$date_end = strtotime($date_end);
 	}
 	
-	$sql = "
-		SELECT *
+	$sql = "SELECT *
 		FROM tagente_datos
 		WHERE
-			datos = " . (int)$value . "
-			AND id_agente_modulo = " . (int)$id_agent_module . "
+			id_agente_modulo = " . (int)$id_agent_module . "
 			AND (utimestamp >= " . $date_init . " AND utimestamp <= " . $date_end . ")";
 	
-	$data = db_get_all_rows_sql($sql,
-		$config['history_db_enabled']);
+	$data = db_get_all_rows_sql($sql, $config['history_db_enabled']);
 	
 	if (empty($data)) {
 		$data = array();
 	}
 	
-	if ($split_interval) {
-		$temp = array();
-		$previous_utimestamp = false;
-		foreach ($data as $row) {
-			if ($previous_utimestamp === false) {
-				$previous_utimestamp = $row['utimestamp'];
-				
-				$temp[] = $row;
+	$interval = modules_get_interval($id_agent_module);
+	
+	$total_time_with_value = 0;
+	$on_value_detected = false;
+	$timestamp_with_value = null;
+	
+	foreach ($data as $row) {
+		if ($row['datos'] == $value) {
+			if (!$on_value_detected) {
+				$timestamp_with_value = $row['utimestamp'];
+				$on_value_detected = true;
 			}
-			else {
-				$diff = $row['utimestamp'] - $previous_utimestamp;
+		}
+		else {
+			if ($on_value_detected) {
+				$total_time_with_value 
+					+= $row['utimestamp'] - $timestamp_with_value;
 				
-				$interval = modules_get_interval($id_agent_module);
-				
-				if ($diff > $interval) {
-					$fake_count = (int)($diff / $interval);
-					
-					$fake = $row;
-					for ($iterator = 1; $iterator <= $fake_count; $iterator++) {
-						$fake['utimestamp'] = $previous_utimestamp + ($iterator * $interval);
-						$temp[] = $fake;
-					}
-				}
-				else {
-					$temp[] = $row;
-				}
-				
-				$previous_utimestamp = $row['utimestamp'];
-				
-				$data = $temp;
+				$on_value_detected = false;
 			}
 		}
 	}
 	
-	return $data;
+	if ($on_value_detected && !empty($data)) {
+		$total_time_with_value 
+			+= $date_end - $timestamp_with_value;
+	}
+	
+	return $total_time_with_value / $interval;
 }
 
+
 function modules_get_first_contact_date($id_agent_module) {
 	global $config;
 	

pandora_console/include/functions_reporting.php

@@ -3715,12 +3715,11 @@ function reporting_availability($report, $content) {
 			$percent_ok = 0;
 		}
 		else {
-			$count_fails = count(
-				modules_get_data_with_value(
-					$item['id_agent_module'],
-					$report["datetime"] - $content['period'],
-					$report["datetime"],
-					0, true));
+			$count_fails = modules_get_count_data_with_value(
+				$item['id_agent_module'],
+				$report["datetime"] - $content['period'],
+				$report["datetime"],
+				0);
 			$percent_ok = (($count_checks - $count_fails) * 100) / $count_checks;
 			$percent_fail = 100 - $percent_ok;
 			

pandora_console/install.php

@@ -63,7 +63,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '6.0dev';
-$build = '150525';
+$build = '150527';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);

pandora_console/pandora_console.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     6.0dev
-%define release     150525
+%define release     150527
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     6.0dev
-%define release     150525
+%define release     150527
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_console/pandoradb_data.sql

@@ -38,7 +38,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('graph_res','5'),
 ('step_compact','1'),
 ('db_scheme_version','6.0dev'),
-('db_scheme_build','PD150525'),
+('db_scheme_build','PD150527'),
 ('show_unknown','0'),
 ('show_lastalerts','1'),
 ('style','pandora'),

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 6.0dev-150525
+Version: 6.0dev-150527
 Architecture: all
 Priority: optional
 Section: admin

pandora_server/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="6.0dev-150525"
+pandora_version="6.0dev-150527"
 
 package_cpan=0
 package_pandora=1

pandora_server/lib/PandoraFMS/Config.pm

@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "6.0dev";
-my $pandora_build = "150525";
+my $pandora_build = "150527";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash

pandora_server/pandora_server.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     6.0dev
-%define release     150525
+%define release     150527
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     6.0dev
-%define release     150525
+%define release     150527
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/util/pandora_db.pl

@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "6.0dev PS150525";
+my $version = "6.0dev PS150527";
 
 # Pandora server configuration
 my %conf;

pandora_server/util/pandora_manage.pl

@@ -35,7 +35,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "6.0dev PS150525";
+my $version = "6.0dev PS150527";
 
 # save program name for logging
 my $progname = basename($0);