Merge remote-tracking branch 'origin/develop' into 2611-Cache_de_vista_de_arbol_y_vista_de_grupos

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.726-180831
+Version: 7.0NG.726-180905
 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="7.0NG.726-180831"
+pandora_version="7.0NG.726-180905"
 
 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

@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.726';
-use constant AGENT_BUILD => '180831';
+use constant AGENT_BUILD => '180905';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;

pandora_agents/unix/pandora_agent.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.726
-%define release     180831
+%define release     180905
 
 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     7.0NG.726
-%define release     180831
+%define release     180905
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.726"
-PI_BUILD="180831"
+PI_BUILD="180905"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180831}
+{180905}
 
 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 ("7.0NG.726(Build 180831)")
+#define PANDORA_VERSION ("7.0NG.726(Build 180905)")
 
 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", "(7.0NG.726(Build 180831))"
+      VALUE "ProductVersion", "(7.0NG.726(Build 180905))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.726-180831
+Version: 7.0NG.726-180905
 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="7.0NG.726-180831"
+pandora_version="7.0NG.726-180905"
 
 package_pear=0
 package_pandora=1

pandora_console/ajax.php

@@ -77,15 +77,6 @@ $isFunctionSkins = enterprise_include_once ('include/functions_skins.php');
 if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK)
 	$config["relative_path"] = enterprise_hook('skins_set_image_skin_path',array($config['id_user']));
 
-// Load user language
-$user_language = get_user_language ($config['id_user']);
-
-$l10n = NULL;
-if (file_exists ('./include/languages/'.$user_language.'.mo')) {
-	$l10n = new gettext_reader (new CachedFileReader ('./include/languages/'.$user_language.'.mo'));
-	$l10n->load_tables();
-}
-
 if (isset($config['metaconsole'])) {
 	// Not cool way of know if we are executing from metaconsole or normal console
 	if ($config['metaconsole'])

pandora_console/extras/mr/20.sql

@@ -1 +1,11 @@
-ALTER TABLE treport_content ADD COLUMN `recursion` TINYINT(1) default NULL;
+START TRANSACTION;
+
+ALTER TABLE treport_content ADD COLUMN `recursion` TINYINT(1) default NULL;
+
+ALTER TABLE tevent_filter ADD COLUMN `user_comment` text NOT NULL;
+ALTER TABLE tevent_filter ADD COLUMN `source` tinytext NOT NULL;
+ALTER TABLE tevent_filter ADD COLUMN `id_extra` tinytext NOT NULL;
+
+ALTER TABLE tagente_modulo ALTER COLUMN `parent_module_id` SET default 0;
+
+COMMIT;

pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql

@@ -1213,6 +1213,9 @@ UPDATE `tlink` SET `link` = 'https://github.com/pandorafms/pandorafms/issues' WH
 -- ---------------------------------------------------------------------
 ALTER TABLE tevent_filter ADD COLUMN `date_from` date DEFAULT NULL;
 ALTER TABLE tevent_filter ADD COLUMN `date_to` date DEFAULT NULL;
+ALTER TABLE tevent_filter ADD COLUMN `user_comment` text NOT NULL;
+ALTER TABLE tevent_filter ADD COLUMN `source` tinytext NOT NULL;
+ALTER TABLE tevent_filter ADD COLUMN `id_extra` tinytext NOT NULL;
 -- ---------------------------------------------------------------------
 -- Table `tusuario`
 -- ---------------------------------------------------------------------
@@ -1228,7 +1231,7 @@ ALTER TABLE tusuario ADD COLUMN `time_autorefresh` int(5) unsigned NOT NULL defa
 -- ---------------------------------------------------------------------
 ALTER TABLE tagente_modulo ADD COLUMN `dynamic_next` bigint(20) NOT NULL default '0';
 ALTER TABLE tagente_modulo ADD COLUMN `dynamic_two_tailed` tinyint(1) unsigned default '0';
-ALTER TABLE tagente_modulo ADD COLUMN `parent_module_id` int(10) unsigned NOT NULL;
+ALTER TABLE tagente_modulo ADD COLUMN `parent_module_id` int(10) unsigned NOT NULL default 0;
 ALTER TABLE `tagente_modulo` ADD COLUMN `cps` int NOT NULL default 0;
 
 -- ---------------------------------------------------------------------

pandora_console/godmode/events/event_edit_filter.php

@@ -65,6 +65,9 @@ if ($id) {
 	$group_rep = $filter['group_rep'];
 	$date_from = str_replace("-","/",$filter['date_from']);
 	$date_to = str_replace("-","/",$filter['date_to']);
+	$source = $filter['source'];
+	$id_extra = $filter['id_extra'];
+	$user_comment = $filter['user_comment'];
 
 	$tag_with_json = $filter['tag_with'];
 	$tag_with_json_clean = io_safe_output($tag_with_json);
@@ -130,6 +133,9 @@ if ($update || $create) {
 	$group_rep = get_parameter('group_rep', '');
 	$date_from = get_parameter('date_from', '');
 	$date_to = get_parameter('date_to', '');
+	$source = get_parameter('source');
+	$id_extra = get_parameter('id_extra');
+	$user_comment = get_parameter('user_comment');
 
 	$tag_with_base64 = get_parameter('tag_with', json_encode(array()));
 	$tag_with_json = io_safe_input(base64_decode($tag_with_base64));
@@ -158,6 +164,9 @@ if ($update || $create) {
 		'tag_without' => $tag_without_json,
 		'date_from' => $date_from,
 		'date_to' => $date_to,
+		'source' => $source,
+		'id_extra' => $id_extra,
+		'user_comment' => $user_comment,
 		'filter_only_alert' => $filter_only_alert);
 }
 
@@ -390,6 +399,16 @@ if (!is_metaconsole()) {
 		$text_module, false, true, '', array(), true, $id_agent_module);
 }
 
+$sources = events_get_all_source();
+$table ->data[22][0] = '<b>' . __('Source') . '</b>';
+$table ->data[22][1] = html_print_select ($sources, 'source', $source, '', '', '', true);
+
+$table ->data[23][0] = '<b>' . __('Extra ID') . '</b>';
+$table ->data[23][1] = html_print_input_text ('id_extra', $id_extra, '', 11, 255, true);
+
+$table ->data[24][0] = '<b>' . __('Comment') . '</b>';
+$table ->data[24][1] = html_print_input_text ('user_comment', $user_comment, '', 35, 255, true);
+
 echo '<form method="post" action="index.php?sec=geventos&sec2=godmode/events/events&section=edit_filter&pure='.$config['pure'].'">';
 html_print_table ($table);
 

pandora_console/godmode/reporting/visual_console_builder.editor.js

@@ -1574,8 +1574,28 @@ function loadFieldsFromDB(item) {
 					$("select[name=clock_animation]").val(val);
 				if (key == 'time_format') 
 					$("select[name=time_format]").val(val);
-				if (key == 'timezone') 
+				if (key == 'timezone') {
-					$("select[name=timezone]").val(val);
+					var zone = val.split("/");
+					$("select[name=zone]").val(zone[0]);
+					
+					$.ajax({
+						type: "POST",
+						url: "ajax.php",
+						data: "page=godmode/setup/setup&select_timezone=1&zone=" + zone[0],
+						dataType: "json",
+						success: function(data) {
+							$("#timezone").empty();
+							jQuery.each (data, function (id, value) {
+								timezone = value;
+								var timezone_country = timezone.replace (/^.*\//g, "");
+								$("select[name='timezone']").append($("<option>").val(timezone).html(timezone_country));
+								if (timezone == val) {
+									$("select[name='timezone']").val(timezone);
+								}
+							});
+						}
+					});
+				}
 							
 				if (key == 'value_show') {
 					$("select[name=value_show]").val(val);

pandora_console/include/config_process.php

@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180831';
+$build_version = 'PC180905';
 $pandora_version = 'v7.0NG.726';
 
 // Do not overwrite default timezone set if defined.

pandora_console/include/functions_events.php

@@ -1529,7 +1529,31 @@ function events_get_all_status ($report = false) {
 	}
 	
 	return $fields;
-} 
+}
+
+/**
+ * Return all event source.
+ *
+ * @return array event source array.
+ */
+function events_get_all_source () {
+	$event_table = events_get_events_table(is_metaconsole(),false);
+	$fields = array ();
+	$fields[''] = __('All');
+	
+	if (users_is_admin()) {
+		$sources = db_get_all_rows_sql("SELECT DISTINCT(source) FROM ". $event_table);
+	} else {
+		$groups_user = users_get_groups ($config['id_user'], "ER", true);
+		$sources = db_get_all_rows_sql("SELECT DISTINCT(source) FROM ". $event_table. " WHERE id_grupo IN (" .implode(",",array_keys($groups_user)) .")");	
+	}
+	
+	foreach ($sources as $key => $source) {
+		$fields[$source['source']] = $source['source'];
+	}
+	
+	return $fields;
+}
 
 /**
  * Decode a numeric status into status description.

pandora_console/install.php

@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.726';
-$build = '180831';
+$build = '180905';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);

pandora_console/operation/events/events.build_query.php

@@ -149,6 +149,18 @@ if ($severity != -1) {
 	}
 }
 
+if ($id_extra != '') {
+	$sql_post .= " AND id_extra LIKE '%$id_extra%'";
+}
+
+if ($user_comment != '') {
+	$sql_post .= " AND user_comment LIKE '%$user_comment%'";
+}
+
+if ($source != '') {
+	$sql_post .= " AND source LIKE '$source'";
+}
+
 // In metaconsole mode the agent search is performed by name
 if ($meta) {
 	$text_agent = get_parameter("text_agent","");

pandora_console/operation/events/events.php

@@ -261,6 +261,9 @@ $time_to = (string)get_parameter('time_to', '');
 $server_id = (int)get_parameter('server_id', 0);
 $text_agent = (string) get_parameter("text_agent");
 $refr = (int) get_parameter ('refresh');
+$id_extra = (string) get_parameter('id_extra');
+$user_comment = (string) get_parameter('user_comment');
+$source = (string) get_parameter('source');
 
 if ($id_agent != 0) {
 	$text_agent = agents_get_alias($id_agent);

pandora_console/operation/events/events_list.php

@@ -89,7 +89,10 @@ if (is_ajax()) {
 		$values['id_group_filter'] = get_parameter('id_group_filter');
 		$values['date_from'] = get_parameter('date_from');
 		$values['date_to'] = get_parameter('date_to');
-
+		$values['source'] = get_parameter('source');
+		$values['id_extra'] = get_parameter('id_extra');
+		$values['user_comment'] = get_parameter('user_comment');
+		
 		$exists = (bool)db_get_value_filter(
 			'id_filter', 'tevent_filter', $values);
 		
@@ -129,6 +132,10 @@ if (is_ajax()) {
 		$values['id_group_filter'] = get_parameter('id_group_filter');
 		$values['date_from'] = get_parameter('date_from');
 		$values['date_to'] = get_parameter('date_to');
+		$values['source'] = get_parameter('source');
+		$values['id_extra'] = get_parameter('id_extra');
+		$values['user_comment'] = get_parameter('user_comment');
+		
 		if (io_safe_output($values['tag_with']) == "[\"0\"]") {
 			$values['tag_with'] = "[]";
 		}
@@ -189,6 +196,10 @@ if ($user_filter != 0 && empty($id_name) && !$update_from_filter_table) {
 	$status = $user_default_filter['status'];
 	$event_view_hr = $user_default_filter['event_view_hr'];
 	$group_rep = $user_default_filter['group_rep'];
+	$id_extra = $user_default_filter['id_extra'];
+	$user_comment = $user_default_filter['user_comment'];
+	$source = $user_default_filter['source'];
+	
 	if ($user_default_filter['search'] != "") {
 		$search = $user_default_filter['search'];
 	}
@@ -654,6 +665,17 @@ $data[2] .= html_print_select ($repeated_sel, "group_rep", $group_rep, '', '', 0
 $table->data[] = $data;
 $table->rowclass[] = '';
 
+$data = array();
+$sources = events_get_all_source();
+$data[0] = __('Source') . $jump;
+$data[0] .= html_print_select ($sources, 'source', $source, '', '', '', true);
+$data[1] = __('Extra ID') . $jump;
+$data[1] .= html_print_input_text ('id_extra', $id_extra, '', 11, 255, true);
+$data[2] = __("Comment") . $jump;
+$data[2] .= html_print_input_text ('user_comment', $user_comment, '', 35, 255, true);
+$table->data[] = $data;
+$table->rowclass[] = '';
+
 $data = array();
 $data[0] = ui_toggle(html_print_table($table_advanced, true),
 	__('Advanced options'), '', true, true);
@@ -952,6 +974,12 @@ $(document).ready( function() {
 							$("#filter_only_alert").val(val);
 						if (i == 'id_group_filter')
 							$("#id_group_filter").val(val);
+						if (i == 'source')
+							$("#source").val(val);
+						if (i == 'id_extra')
+							$("#text-id_extra").val(val);
+						if (i == 'user_comment')
+							$("#text-user_comment").val(val);
 					});
 					reorder_tags_inputs();
 					// Update the info with the loaded filter
@@ -990,6 +1018,9 @@ $(document).ready( function() {
 			$("#pagination").val(20);
 			$("#update_from_filter_table").val(1);
 			$("#text_id_agent").val("");
+			$("#source").val('');
+			$("#text-id_extra").val('');
+			$("#text-user_comment").val('');
 			
 			clear_tags_inputs();
 			
@@ -1058,6 +1089,12 @@ $(document).ready( function() {
 								$("#text-date_to").val(val.replace(/\-/g,"/"));
 							}
 						}
+						if (i == 'source')
+							$("#source").val(val);
+						if (i == 'id_extra')
+							$("#text-id_extra").val(val);
+						if (i == 'user_comment')
+							$("#text-user_comment").val(val);
 					});
 					reorder_tags_inputs();
 					// Update the info with the loaded filter
@@ -1123,7 +1160,10 @@ $(document).ready( function() {
 				"filter_only_alert" : $("#filter_only_alert").val(),
 				"id_group_filter": $("#id_group_filter").val(),
 				"date_from": $("#text-date_from").val(),
-				"date_to": $("#text-date_to").val()
+				"date_to": $("#text-date_to").val(),
+				"source": $("#source").val(),
+				"id_extra": $("#text-id_extra").val(),
+				"user_comment": $("#text-user_comment").val()
 			},
 			function (data) {
 				$(".info_box").hide();
@@ -1220,7 +1260,10 @@ $(document).ready( function() {
 			"filter_only_alert" : $("#filter_only_alert").val(),
 			"id_group_filter": $("#id_group_filter").val(),
 			"date_from": $("#text-date_from").val(),
-			"date_to": $("#text-date_to").val()
+			"date_to": $("#text-date_to").val(),
+			"source": $("#source").val(),
+			"id_extra": $("#text-id_extra").val(),
+			"user_comment": $("#text-user_comment").val()
 			},
 			function (data) {
 				$(".info_box").hide();

pandora_console/operation/gis_maps/public_console.php

@@ -153,11 +153,15 @@ if ($layers != false) {
 		foreach ($groupsByAgentId as $agentId => $groupInfo) {
 			$agentNamesOfGroupItems[$agentId] = $groupInfo["agent_name"];
 		}
-
+		
 		$agentNames = array_unique($agentNamesByGroup + $agentNamesByLayer + $agentNamesOfGroupItems);
 
 		foreach ($agentNames as $agentName) {
 			$idAgent = agents_get_agent_id($agentName);
+			if (!$idAgent) {
+				$idAgent = agents_get_agent_id_by_alias($agentName);
+				$idAgent = (!empty($idAgent)) ? $idAgent[0]['id_agente'] : 0;
+			}
 			$coords = gis_get_data_last_position_agent($idAgent);
 			
 			if ($coords === false) {

pandora_console/pandora_console.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.726
-%define release     180831
+%define release     180905
 
 # 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     7.0NG.726
-%define release     180831
+%define release     180905
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_console/pandoradb.sql

@@ -259,7 +259,7 @@ CREATE TABLE IF NOT EXISTS `tagente_modulo` (
 	`prediction_sample_window` int(10) default 0,
 	`prediction_samples` int(4) default 0,
 	`prediction_threshold` int(4) default 0,
-	`parent_module_id` int(10) unsigned NOT NULL,
+	`parent_module_id` int(10) unsigned NOT NULL default 0,
 	`cps` int NOT NULL default 0,
 	PRIMARY KEY  (`id_agente_modulo`),
 	KEY `main_idx` (`id_agente_modulo`,`id_agente`),
@@ -1079,6 +1079,9 @@ CREATE TABLE IF NOT EXISTS `tevent_filter` (
 	`filter_only_alert` int(10) NOT NULL default -1,
 	`date_from` date default NULL,
 	`date_to` date default NULL,
+	`source` tinytext NOT NULL,
+	`id_extra` tinytext NOT NULL,
+	`user_comment` text NOT NULL,
 	PRIMARY KEY  (`id_filter`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.726-180831
+Version: 7.0NG.726-180905
 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="7.0NG.726-180831"
+pandora_version="7.0NG.726-180905"
 
 package_cpan=0
 package_pandora=1

pandora_server/lib/PandoraFMS/Config.pm

@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.726";
-my $pandora_build = "180831";
+my $pandora_build = "180905";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash

pandora_server/lib/PandoraFMS/PluginTools.pm

@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.726";
-my $pandora_build = "180831";
+my $pandora_build = "180905";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );

pandora_server/pandora_server.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.726
-%define release     180831
+%define release     180905
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.726
-%define release     180831
+%define release     180905
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server_installer

@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.726"
-PI_BUILD="180831"
+PI_BUILD="180905"
 
 MODE=$1
 if [ $# -gt 1 ]; then

pandora_server/util/pandora_db.pl

@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.726 PS180831";
+my $version = "7.0NG.726 PS180905";
 
 # Pandora server configuration
 my %conf;

pandora_server/util/pandora_manage.pl

@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.726 PS180831";
+my $version = "7.0NG.726 PS180905";
 
 # save program name for logging
 my $progname = basename($0);