Merge branch 'develop' of github.com:pandorafms/pandorafms into develop

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 5.1SP1-141003
+Version: 5.1SP1-141006
 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="5.1SP1-141003"
+pandora_version="5.1SP1-141006"
 
 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 => '5.1SP1';
-use constant AGENT_BUILD => '141003';
+use constant AGENT_BUILD => '141006';
 
 # 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     5.1SP1
-%define release     141003
+%define release     141006
 
 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     5.1SP1
-%define release     141003
+%define release     141006
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{141003}
+{141006}
 
 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 ("5.1SP1(Build 141003)")
+#define PANDORA_VERSION ("5.1SP1(Build 141006)")
 
 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", "(5.1SP1(Build 141003))"
+      VALUE "ProductVersion", "(5.1SP1(Build 141006))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 5.1SP1-141003
+Version: 5.1SP1-141006
 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="5.1SP1-141003"
+pandora_version="5.1SP1-141006"
 
 package_pear=0
 package_pandora=1

pandora_console/include/config_process.php

@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC141003';
+$build_version = 'PC141006';
 $pandora_version = 'v5.1SP1';
 
 // Do not overwrite default timezone set if defined.

pandora_console/include/functions.php

@@ -1010,23 +1010,32 @@ function is_module_uncompressed ($module_type) {
 function get_event_types ($id_type = false) {
 	global $config;
 	
-	$types = array ();
+	$types = array();
-	
-	$types['unknown'] = __('Unknown');
 	
 	$types['critical'] = __('Monitor Critical');
 	$types['warning'] = __('Monitor Warning');
 	$types['normal'] = __('Monitor Normal');
+	$types['unknown'] = __('Unknown');
 	$types['going_unknown'] = __('Monitor Unknown');
 
 	$types['alert_fired'] = __('Alert fired');
 	$types['alert_recovered'] = __('Alert recovered');
 	$types['alert_ceased'] = __('Alert ceased');
 	$types['alert_manual_validation'] = __('Alert manual validation');
+	
+	$types['new_agent'] = __('Agent created');
 	$types['recon_host_detected'] = __('Recon host detected');
 	$types['system'] = __('System');
 	$types['error'] = __('Error');
-	$types['configuration_change'] = __('Configuration change ');
+	$types['configuration_change'] = __('Configuration change');
+
+	// This types are impersonated by the monitor 'x' types
+	// $types['going_up_normal'] = __('Going Normal');
+	// $types['going_up_warning'] = __('Going Warning');
+	// $types['going_up_critical'] = __('Going Critical');
+	// $types['going_down_warning'] = __('Going down Warning');
+	// $types['going_down_normal'] = __('Going down Normal');
+	// $types['going_down_critical'] = __('Going down Critical');
 
 	foreach ($types as $key => $type) {
 		$types[$key] = ui_print_truncate_text($type, GENERIC_SIZE_TEXT, false, true, false);

pandora_console/include/functions_agents.php

@@ -1769,6 +1769,7 @@ function agents_delete_agent ($id_agents, $disableACL = false) {
 		// db_process_delete_temp ("tagent_access", "id_agent", $id_agent);
 		
 		// Delete agent policies
+		enterprise_include_once('include/functions_policies.php');
 		enterprise_hook('policies_delete_agent', array($id_agent));
 		
 		// Delete agent in networkmap enterprise

pandora_console/include/help/ja/help_postprocess.php

@@ -9,6 +9,11 @@
 例えば、収集データが 1024 であった場合に、データ保存倍率の設定が 1000 であれば、データベースには 1024000 が保存されます。
 これは、データを標準化したい場合や特定の単位に変換して保存したい場合に便利です。
 また、1未満の数値を設定することにより保存データを割ることもできます。
-たとえば、0.001を設定すると、実際のデータを 1000 で割った値が保存されます。
+たとえば、0.001を設定すると、実際のデータを 1000 で割った値が保存されます。その他の例を以下に示します。
+<li>timeticks(SNMP) を日に変換: 0.000000115740741
+<li>Bytes を MBytes に変換: 0.00000095367432
+<li>Bytes を GBytes に変換: 0.00000000093132
+<li>Bbits を MBytes に変換: 0.125
+<li>
 <br /><br />
 未設定もしくは 0 を設定すると、データ保存倍率の設定は無効になります。(デフォルト)

pandora_console/install.php

@@ -63,7 +63,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '5.1SP1';
-$build = '141003';
+$build = '141006';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);

pandora_console/pandora_console.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     5.1SP1
-%define release     141003
+%define release     141006
 
 # 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     5.1SP1
-%define release     141003
+%define release     141006
 %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','5.1SP1'),
-('db_scheme_build','PD141003'),
+('db_scheme_build','PD141006'),
 ('show_unknown','0'),
 ('show_lastalerts','1'),
 ('style','pandora'),

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 5.1SP1-141003
+Version: 5.1SP1-141006
 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="5.1SP1-141003"
+pandora_version="5.1SP1-141006"
 
 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 = "5.1SP1";
-my $pandora_build = "141003";
+my $pandora_build = "141006";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash

pandora_server/pandora_server.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     5.1SP1
-%define release     141003
+%define release     141006
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     5.1SP1
-%define release     141003
+%define release     141006
 
 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 = "5.1SP1 PS141003";
+my $version = "5.1SP1 PS141006";
 
 # Pandora server configuration
 my %conf;

pandora_server/util/pandora_manage.pl

@@ -34,7 +34,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "5.1SP1 PS141003";
+my $version = "5.1SP1 PS141006";
 
 # save program name for logging
 my $progname = basename($0);