diff --git a/extras/pandora_update_version.sh b/extras/pandora_update_version.sh index 0b22878285..90c4bf6519 100755 --- a/extras/pandora_update_version.sh +++ b/extras/pandora_update_version.sh @@ -16,7 +16,7 @@ else fi VERSION=$2 if [ $# == 2 ]; then - BUILD=`date +%g%m%d` + BUILD=`date +%y%m%d` else BUILD=$3 fi diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index dd924a000d..5edf2e031e 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.730-181221 +Version: 7.0NG.730-190121 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index e6b6e6b27c..47d6c97643 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/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.730-181221" +pandora_version="7.0NG.730-190121" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index d1f3673d33..54b12f4f5b 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -42,7 +42,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.730'; -use constant AGENT_BUILD => '181221'; +use constant AGENT_BUILD => '190121'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; @@ -516,11 +516,18 @@ sub parse_conf_modules($) { log_message ('setup', "Invalid regular expression in intensive condition: $line"); } } - } elsif ($line =~ /^\s*module_crontab\s+(((\*|(\d+(-\d+){0,1}))\s*){5}).*$/) { + } elsif ($line =~ /^\s*module_crontab\s+(.*)$/) { my $cron_text = $1; chomp ($cron_text); + $cron_text =~ s/\s+$//; + # Get module name if is already read. + my $module_name_message = ""; + $module_name_message = " (module $module->{'name'})" if defined($module->{'name'}); if (cron_check_syntax($cron_text)) { $module->{'cron'} = $cron_text; + log_message('debug', "Cron '$module->{'cron'}' configured $module_name_message."); + } else { + log_message('setup', "Incorrect cron syntax '$cron_text'. This module$module_name_message will be executed always."); } } elsif ($line =~ /^\s*module_end\s*$/) { @@ -2397,6 +2404,7 @@ sub check_module_cron { $interval ); + my $is_first = ($module->{'cron_utimestamp'} == 0) ? 1 : 0; $module->{'cron_utimestamp'} = $now + $time_to_next_execution; $module->{'cron_interval'} = $time_to_next_execution; @@ -2405,7 +2413,7 @@ sub check_module_cron { } # On first execution checking if cron is valid is required - return 1 unless ($module->{'cron_utimestamp'} == 0); + return 1 unless ($is_first); # Check if current timestamp is a valid cron date my $next_execution = cron_next_execution_date( diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 90e5117caa..6fb7b30b81 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.730 -%define release 181221 +%define release 190121 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 291d1f4f28..5bbd32b462 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.730 -%define release 181221 +%define release 190121 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 46789eec6d..47fb301e3b 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.730" -PI_BUILD="181221" +PI_BUILD="190121" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index d1af78c018..945e983da3 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{181221} +{190121} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index cd4c54e725..fee3ef8459 100644 --- a/pandora_agents/win32/pandora.cc +++ b/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.730(Build 181221)") +#define PANDORA_VERSION ("7.0NG.730(Build 190121)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index a005167306..71d61237d1 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/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.730(Build 181221))" + VALUE "ProductVersion", "(7.0NG.730(Build 190121))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index cddd82ded6..ec72bc0293 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.730-181221 +Version: 7.0NG.730-190121 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 8c875277a4..7aa7dbadd5 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/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.730-181221" +pandora_version="7.0NG.730-190121" package_pear=0 package_pandora=1 diff --git a/pandora_console/ajax.php b/pandora_console/ajax.php index 97ffe031a9..c7d21fff1a 100644 --- a/pandora_console/ajax.php +++ b/pandora_console/ajax.php @@ -14,6 +14,15 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. +// Enable profiler for testing +if (!defined("__PAN_XHPROF__")) define ("__PAN_XHPROF__", 0); + +if (__PAN_XHPROF__ === 1) { + if (function_exists('tideways_xhprof_enable')) { + tideways_xhprof_enable(); + } +} + if ((! file_exists("include/config.php")) || (! is_readable("include/config.php"))) { exit; } @@ -88,4 +97,8 @@ if (file_exists ($page)) { else { echo '
Sorry! I can\'t find the page '.$page.'!'; } + +if (__PAN_XHPROF__ === 1) { + pandora_xhprof_display_result("ajax", "console"); +} ?> diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql index 78c16503e9..5dc7cd70c4 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql @@ -48,8 +48,6 @@ CREATE TABLE IF NOT EXISTS `tlocal_component` ( `dynamic_interval` int(4) unsigned default '0', `dynamic_max` int(4) default '0', `dynamic_min` int(4) default '0', - `dynamic_next` bigint(20) NOT NULL default '0', - `dynamic_two_tailed` tinyint(1) unsigned default '0', `prediction_sample_window` int(10) default 0, `prediction_samples` int(4) default 0, `prediction_threshold` int(4) default 0, @@ -58,6 +56,9 @@ CREATE TABLE IF NOT EXISTS `tlocal_component` ( ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +ALTER TABLE `tlocal_component` ADD COLUMN `dynamic_next` bigint(20) NOT NULL default '0'; +ALTER TABLE `tlocal_component` ADD COLUMN `dynamic_two_tailed` tinyint(1) unsigned default '0'; + -- ----------------------------------------------------- -- Table `tpolicy_modules` -- ----------------------------------------------------- @@ -125,8 +126,6 @@ CREATE TABLE IF NOT EXISTS `tpolicy_modules` ( `dynamic_interval` int(4) unsigned default '0', `dynamic_max` int(4) default '0', `dynamic_min` int(4) default '0', - `dynamic_next` bigint(20) NOT NULL default '0', - `dynamic_two_tailed` tinyint(1) unsigned default '0', `prediction_sample_window` int(10) default 0, `prediction_samples` int(4) default 0, `prediction_threshold` int(4) default 0, @@ -135,6 +134,9 @@ CREATE TABLE IF NOT EXISTS `tpolicy_modules` ( UNIQUE (`id_policy`, `name`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +ALTER TABLE `tpolicy_modules` ADD COLUMN `dynamic_next` bigint(20) NOT NULL default '0'; +ALTER TABLE `tpolicy_modules` ADD COLUMN `dynamic_two_tailed` tinyint(1) unsigned default '0'; + -- --------------------------------------------------------------------- -- Table `tpolicies` -- --------------------------------------------------------------------- @@ -181,6 +183,9 @@ CREATE TABLE IF NOT EXISTS `tpolicy_agents` ( UNIQUE (`id_policy`, `id_agent`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +ALTER TABLE `tpolicy_agents` ADD COLUMN `id_node` int(10) NOT NULL DEFAULT '0'; +ALTER TABLE `tpolicy_agents` ADD UNIQUE(`id_policy`, `id_agent`, `id_node`); + -- ----------------------------------------------------- -- Table `tpolicy_groups` -- ----------------------------------------------------- @@ -292,6 +297,8 @@ CREATE TABLE IF NOT EXISTS `tagent_module_inventory` ( ON UPDATE CASCADE ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +ALTER TABLE `tagent_module_inventory` ADD COLUMN `custom_fields` MEDIUMBLOB NOT NULL; + -- --------------------------------------------------------------------- -- Table `tpolicy_modules_inventory` -- --------------------------------------------------------------------- @@ -310,6 +317,8 @@ CREATE TABLE IF NOT EXISTS `tpolicy_modules_inventory` ( ON UPDATE CASCADE ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +ALTER TABLE `tpolicy_modules_inventory` ADD COLUMN `custom_fields` MEDIUMBLOB NOT NULL; + -- ----------------------------------------------------- -- Table `tagente_datos_inventory` -- ----------------------------------------------------- @@ -341,18 +350,13 @@ CREATE TABLE IF NOT EXISTS `ttrap_custom_values` ( -- ----------------------------------------------------- CREATE TABLE IF NOT EXISTS `tmetaconsole_setup` ( `id` int(10) NOT NULL auto_increment primary key, - `server_name` text, - `server_url` text, - `dbuser` text, - `dbpass` text, - `dbhost` text, - `dbport` text, - `dbname` text, - `meta_dbuser` text, - `meta_dbpass` text, - `meta_dbhost` text, - `meta_dbport` text, - `meta_dbname` text, + `server_name` text default '', + `server_url` text default '', + `dbuser` text default '', + `dbpass` text default '', + `dbhost` text default '', + `dbport` text default '', + `dbname` text default '', `auth_token` text default '', `id_group` int(10) unsigned NOT NULL default 0, `api_password` text NOT NULL, @@ -362,6 +366,12 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_setup` ( COMMENT = 'Table to store metaconsole sources' DEFAULT CHARSET=utf8; +ALTER TABLE tmetaconsole_setup ADD COLUMN `meta_dbuser` text; +ALTER TABLE tmetaconsole_setup ADD COLUMN `meta_dbpass` text; +ALTER TABLE tmetaconsole_setup ADD COLUMN `meta_dbhost` text; +ALTER TABLE tmetaconsole_setup ADD COLUMN `meta_dbport` text; +ALTER TABLE tmetaconsole_setup ADD COLUMN `meta_dbname` text; + -- --------------------------------------------------------------------- -- Table `tprofile_view` -- --------------------------------------------------------------------- @@ -400,7 +410,7 @@ CREATE TABLE IF NOT EXISTS `tservice` ( `id_template_alert_warning` int(10) unsigned NOT NULL default 0, `id_template_alert_critical` int(10) unsigned NOT NULL default 0, `id_template_alert_unknown` int(10) unsigned NOT NULL default 0, - `id_template_alert_critical_sla` int(10) unsigned NOT NULL default 0 + `id_template_alert_critical_sla` int(10) unsigned NOT NULL default 0, PRIMARY KEY (`id`) ) ENGINE=InnoDB COMMENT = 'Table to define services to monitor' @@ -544,11 +554,12 @@ CREATE TABLE IF NOT EXISTS `tevent_rule` ( `user_comment` text NOT NULL, `id_tag` integer(10) unsigned NOT NULL default '0', `name` text default '', - `group_recursion` INT(1) unsigned default 0, PRIMARY KEY (`id_event_rule`), KEY `idx_id_event_alert` (`id_event_alert`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +ALTER TABLE `tevent_rule` ADD COLUMN `group_recursion` INT(1) unsigned default 0; + -- ----------------------------------------------------- -- Table `tevent_alert` -- ----------------------------------------------------- @@ -745,14 +756,15 @@ CREATE TABLE IF NOT EXISTS `treport_content_template` ( `module_names` TEXT, `module_free_text` TEXT, `each_agent` tinyint(1) default 1, - `historical_db` tinyint(1) UNSIGNED NOT NULL default 0, - `lapse_calc` tinyint(1) UNSIGNED NOT NULL default '0', - `lapse` int(11) UNSIGNED NOT NULL default '300', - `visual_format` tinyint(1) UNSIGNED NOT NULL default '0', - `hide_no_data` tinyint(1) default 0, PRIMARY KEY(`id_rc`) ) ENGINE = InnoDB DEFAULT CHARSET=utf8; +ALTER TABLE treport_content_template ADD COLUMN `historical_db` tinyint(1) NOT NULL DEFAULT '0'; +ALTER TABLE treport_content_template ADD COLUMN `lapse_calc` tinyint(1) default '0'; +ALTER TABLE treport_content_template ADD COLUMN `lapse` int(11) default '300'; +ALTER TABLE treport_content_template ADD COLUMN `visual_format` tinyint(1) default '0'; +ALTER TABLE treport_content_template ADD COLUMN `hide_no_data` tinyint(1) default '0'; + -- ----------------------------------------------------- -- Table `treport_content_sla_com_temp` (treport_content_sla_combined_template) -- ----------------------------------------------------- @@ -861,6 +873,9 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_event` ( -- Criticity: 5 - Minor -- Criticity: 6 - Major +ALTER TABLE `tmetaconsole_event` ADD COLUMN `data` double(22,5) default NULL; +ALTER TABLE `tmetaconsole_event` ADD COLUMN `module_status` int(4) NOT NULL default '0'; + -- --------------------------------------------------------------------- -- Table `tmetaconsole_event_history` -- --------------------------------------------------------------------- @@ -906,6 +921,8 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_event_history` ( -- Criticity: 5 - Minor -- Criticity: 6 - Major +ALTER TABLE `tmetaconsole_event_history` ADD COLUMN `data` double(22,5) default NULL; +ALTER TABLE `tmetaconsole_event_history` ADD COLUMN `module_status` int(4) NOT NULL default '0'; -- --------------------------------------------------------------------- -- Table `textension_translate_string` -- --------------------------------------------------------------------- @@ -958,12 +975,10 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_agent` ( `agent_version` varchar(100) default '', `ultimo_contacto_remoto` datetime default '1970-01-01 00:00:00', `disabled` tinyint(2) NOT NULL default '0', - `remote` tinyint(1) NOT NULL default '0', `id_parent` int(10) unsigned default '0', `custom_id` varchar(255) default '', `server_name` varchar(100) default '', `cascade_protection` tinyint(2) NOT NULL default '0', - `cascade_protection_module` int(10) unsigned default '0', `timezone_offset` TINYINT(2) NULL DEFAULT '0' COMMENT 'number of hours of diference with the server timezone' , `icon_path` VARCHAR(127) NULL DEFAULT NULL COMMENT 'path in the server to the image of the icon representing the agent' , `update_gis_data` TINYINT(1) NOT NULL DEFAULT '1' COMMENT 'set it to one to update the position data (altitude, longitude, latitude) when getting information from the agent or to 0 to keep the last value and do not update it' , @@ -978,8 +993,6 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_agent` ( `fired_count` bigint(20) NOT NULL default '0', `update_module_count` tinyint(1) NOT NULL default '0', `update_alert_count` tinyint(1) NOT NULL default '0', - `transactional_agent` tinyint(1) NOT NULL default '0', - `alias` varchar(600) BINARY NOT NULL default '', PRIMARY KEY (`id_agente`), KEY `nombre` (`nombre`(255)), KEY `direccion` (`direccion`), @@ -988,6 +1001,11 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_agent` ( FOREIGN KEY (`id_tmetaconsole_setup`) REFERENCES tmetaconsole_setup(`id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +ALTER TABLE tmetaconsole_agent ADD COLUMN `remote` tinyint(1) NOT NULL default '0'; +ALTER TABLE tmetaconsole_agent ADD COLUMN `cascade_protection_module` int(10) default '0'; +ALTER TABLE tmetaconsole_agent ADD COLUMN `transactional_agent` tinyint(1) NOT NULL default '0'; +ALTER TABLE tmetaconsole_agent ADD COLUMN `alias` VARCHAR(600) not null DEFAULT ''; + -- --------------------------------------------------------------------- -- Table `ttransaction` -- --------------------------------------------------------------------- @@ -1306,6 +1324,10 @@ ALTER TABLE tlayout_data ADD COLUMN `clock_animation` varchar(60) NOT NULL defau ALTER TABLE tlayout_data ADD COLUMN `time_format` varchar(60) NOT NULL default "time"; ALTER TABLE tlayout_data ADD COLUMN `timezone` varchar(60) NOT NULL default "Europe/Madrid"; ALTER TABLE tlayout_data ADD COLUMN `show_last_value` tinyint(1) UNSIGNED NULL default '0'; +ALTER TABLE `tlayout_data` ADD COLUMN `linked_layout_status_type` ENUM ('default', 'weight', 'service') DEFAULT 'default'; +ALTER TABLE `tlayout_data` ADD COLUMN `linked_layout_status_as_service_warning` FLOAT(20, 3) NOT NULL default 0; +ALTER TABLE `tlayout_data` ADD COLUMN `linked_layout_status_as_service_critical` FLOAT(20, 3) NOT NULL default 0; +ALTER TABLE `tlayout_data` ADD COLUMN `linked_layout_node_id` INT(10) NOT NULL default 0; -- --------------------------------------------------------------------- -- Table `tagent_custom_fields` @@ -1359,26 +1381,15 @@ ALTER TABLE treport_content ADD COLUMN `recursion` tinyint(1) default NULL; -- --------------------------------------------------------------------- ALTER TABLE tmodule_relationship ADD COLUMN `id_server` varchar(100) NOT NULL DEFAULT ''; --- Table `tlocal_component` --- --------------------------------------------------------------------- -ALTER TABLE tlocal_component ADD COLUMN `dynamic_next` bigint(20) NOT NULL default '0'; -ALTER TABLE tlocal_component ADD COLUMN `dynamic_two_tailed` tinyint(1) unsigned default '0'; - -- --------------------------------------------------------------------- -- Table `tpolicy_module` -- --------------------------------------------------------------------- ALTER TABLE tpolicy_modules ADD COLUMN `ip_target`varchar(100) default ''; -ALTER TABLE tpolicy_modules ADD COLUMN `dynamic_next` bigint(20) NOT NULL default '0'; -ALTER TABLE tpolicy_modules ADD COLUMN `dynamic_two_tailed` tinyint(1) unsigned default '0'; ALTER TABLE `tpolicy_modules` ADD COLUMN `cps` int NOT NULL DEFAULT 0; -- --------------------------------------------------------------------- -- Table `tmetaconsole_agent` -- --------------------------------------------------------------------- -ALTER TABLE tmetaconsole_agent ADD COLUMN `remote` tinyint(1) NOT NULL default '0'; -ALTER TABLE tmetaconsole_agent ADD COLUMN `cascade_protection_module` int(10) default '0'; -ALTER TABLE tmetaconsole_agent ADD COLUMN `transactional_agent` tinyint(1) NOT NULL default '0'; -ALTER TABLE tmetaconsole_agent ADD COLUMN `alias` VARCHAR(600) not null DEFAULT ''; ALTER TABLE tmetaconsole_agent ADD COLUMN `alias_as_name` int(2) unsigned default '0'; ALTER TABLE tmetaconsole_agent ADD COLUMN `safe_mode_module` int(10) unsigned NOT NULL default '0'; ALTER TABLE `tmetaconsole_agent` ADD COLUMN `cps` int NOT NULL default 0; @@ -1543,6 +1554,8 @@ ALTER TABLE `tdashboard` ADD COLUMN `cells_slideshow` TINYINT(1) NOT NULL defaul -- --------------------------------------------------------------------- -- Table `tsnmp_filter` -- --------------------------------------------------------------------- +ALTER TABLE tsnmp_filter ADD unified_filters_id int(10) NOT NULL DEFAULT 0; + SELECT max(unified_filters_id) INTO @max FROM tsnmp_filter; UPDATE tsnmp_filter tsf,(SELECT @max:= @max) m SET tsf.unified_filters_id = @max:= @max + 1 where tsf.unified_filters_id=0; @@ -1733,7 +1746,7 @@ CREATE TABLE IF NOT EXISTS `tautoconfig_actions` ( -- --------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `tlayout_template` ( `id` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, - `name` varchar(50) NOT NULL, + `name` varchar(600) NOT NULL, `id_group` INTEGER UNSIGNED NOT NULL, `background` varchar(200) NOT NULL, `height` INTEGER UNSIGNED NOT NULL default 0, @@ -1779,11 +1792,15 @@ CREATE TABLE IF NOT EXISTS `tlayout_template_data` ( `clock_animation` varchar(60) NOT NULL default "analogic_1", `time_format` varchar(60) NOT NULL default "time", `timezone` varchar(60) NOT NULL default "Europe/Madrid", + `show_last_value` tinyint(1) UNSIGNED NULL default '0', + `linked_layout_status_type` ENUM ('default', 'weight', 'service') DEFAULT 'default', + `linked_layout_status_as_service_warning` FLOAT(20, 3) NOT NULL default 0, + `linked_layout_status_as_service_critical` FLOAT(20, 3) NOT NULL default 0, + `linked_layout_node_id` INT(10) NOT NULL default 0, PRIMARY KEY(`id`), FOREIGN KEY (`id_layout_template`) REFERENCES tlayout_template(`id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE = InnoDB DEFAULT CHARSET=utf8; -ALTER TABLE tlayout_template_data ADD COLUMN `show_last_value` tinyint(1) UNSIGNED NULL default '0'; -- --------------------------------------------------------------------- -- Table `tlog_graph_models` -- --------------------------------------------------------------------- @@ -1826,11 +1843,28 @@ CREATE TABLE IF NOT EXISTS `tagent_custom_fields_filter` ( `id_custom_fields_data` varchar(600) default '', `id_status` varchar(600) default '', `module_search` varchar(600) default '', + `module_status` varchar(600) default '', + `recursion` int(1) unsigned default '0', + `group_search` int(10) unsigned default '0', PRIMARY KEY(`id`) ) ENGINE = InnoDB DEFAULT CHARSET=utf8; -ALTER TABLE `tagent_custom_fields_filter` ADD COLUMN `module_status` varchar(600) default ''; +-- --------------------------------------------------------------------- +-- Table `tevento` +-- --------------------------------------------------------------------- +ALTER TABLE `tevento` ADD COLUMN `data` double(22,5) default NULL; -ALTER TABLE `tagent_custom_fields_filter` ADD COLUMN `recursion` int(1) unsigned default '0'; +ALTER TABLE `tevento` ADD COLUMN `module_status` int(4) NOT NULL default '0'; -ALTER TABLE `tagent_custom_fields_filter` ADD COLUMN `group_search` int(10) unsigned default '0'; +-- ----------------------------------------------------- +-- Table `tgis_map_layer_groups` +-- ----------------------------------------------------- +CREATE TABLE IF NOT EXISTS `tgis_map_layer_groups` ( + `layer_id` INT NOT NULL, + `group_id` MEDIUMINT(4) UNSIGNED NOT NULL, + `agent_id` INT(10) UNSIGNED NOT NULL COMMENT 'Used to link the position to the group', + PRIMARY KEY (`layer_id`, `group_id`), + FOREIGN KEY (`layer_id`) REFERENCES `tgis_map_layer` (`id_tmap_layer`) ON DELETE CASCADE, + FOREIGN KEY (`group_id`) REFERENCES `tgrupo` (`id_grupo`) ON DELETE CASCADE, + FOREIGN KEY (`agent_id`) REFERENCES `tagente` (`id_agente`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php index 7c7734f67d..079ff74573 100644 --- a/pandora_console/godmode/agentes/module_manager_editor.php +++ b/pandora_console/godmode/agentes/module_manager_editor.php @@ -573,18 +573,27 @@ ui_require_javascript_file ('pandora_modules'); ?> diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index e0d723f615..fd05f10323 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC181221'; +$build_version = 'PC190121'; $pandora_version = 'v7.0NG.730'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 1e43ae46fd..f2056f058e 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -3400,5 +3400,39 @@ function validate_csrf_code() { function generate_hash_to_api(){ hash('sha256', db_get_value ('value', 'tupdate_settings', '`key`', 'customer_key')); +} + +/** + * Disable the profiller and display de result + * + * @param string Key to identify the profiler run. + * @param string Way to display the result + * "link" (default): Click into word "Performance" to display the profilling info. + * "console": Display with a message in pandora_console.log. + */ +function pandora_xhprof_display_result($key = "", $method = "link") { + // Check if function exists + if (!function_exists('tideways_xhprof_disable')) { + error_log("Cannot find tideways_xhprof_disable function"); + return; } + + $run_id = uniqid(); + $data = tideways_xhprof_disable(); + $source = "pandora_$key"; + file_put_contents( + sys_get_temp_dir() . "/" . $run_id . ".$source.xhprof", + serialize($data) + ); + $new_url = "http://{$_SERVER['HTTP_HOST']}/profiler/index.php?run={$run_id}&source={$source}"; + switch($method) { + case "console": + error_log("'{$new_url}'"); + case "link": + default: + echo "Performance\n"; + break; + + } +} ?> diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index d69a27d8fe..b1d258e223 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -827,7 +827,8 @@ function agents_get_group_agents ( $filter = array(); - if (!$noACL) { + // check available groups for target user only if asking for 'All' group + if (!$noACL && $id_group == 0) { $id_group = $id_group == 0 ? array_keys(users_get_groups(false, "AR", false)) : groups_safe_acl($config["id_user"], $id_group, "AR"); @@ -848,7 +849,8 @@ function agents_get_group_agents ( $id_group = groups_get_id_recursive($id_group, true); } - if (!$noACL) { + // check available groups for target user only if asking for 'All' group + if (!$noACL && $id_group == 0) { $id_group = array_keys( users_get_groups(false, "AR", true, false, (array)$id_group)); } @@ -1231,8 +1233,8 @@ function agents_get_modules ($id_agent = null, $details = false, ON tagente.id_agente = tasg.id_agent WHERE tagente_modulo.delete_pending = 0 AND %s - GROUP BY tagente_modulo.id_agente_modulo - ORDER BY tagente_modulo.nombre', + GROUP BY 1 + ORDER BY 1', ($details != 'tagente_modulo.*' && $indexed) ? 'tagente_modulo.id_agente_modulo,' : '', io_safe_output(implode (",", (array) $details)), $sql_tags_join, diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php index f72e3b6626..d42f0e4921 100644 --- a/pandora_console/include/functions_api.php +++ b/pandora_console/include/functions_api.php @@ -32,6 +32,7 @@ include_once($config['homedir'] . "/include/functions_servers.php"); include_once($config['homedir'] . "/include/functions_planned_downtimes.php"); include_once($config['homedir'] . "/include/functions_db.php"); include_once($config['homedir'] . "/include/functions_event_responses.php"); +include_once($config['homedir'] . "/include/functions_policies.php"); enterprise_include_once ('include/functions_local_components.php'); enterprise_include_once ('include/functions_events.php'); enterprise_include_once ('include/functions_agents.php'); @@ -6448,6 +6449,63 @@ function api_set_update_snmp_module_policy($id, $thrash1, $other, $thrash3) { array('type' => 'string', 'data' => __('SNMP policy module updated.'))); } +/** + * Remove an agent from a policy. + * @param $id Id of the policy + * @param $id2 Id of the agent policy + * @param $trash1 + * @param $trash2 + * + * Example: + * api.php?op=set&op2=remove_agent_from_policy&apipass=1234&user=admin&pass=pandora&id=11&id2=2 + */ +function api_set_remove_agent_from_policy ($id, $id2, $thrash2, $thrash3) { + global $config; + + if (!check_acl($config['id_user'], 0, "AW")){ + returnError('forbidden', 'string'); + return; + } + + if ($id == '' || !$id) { + returnError('error_parameter', __('Error deleting agent from policy. Policy cannot be left blank.')); + return; + } + + if ($id2 == '' || !$id2) { + returnError('error_parameter', __('Error deleting agent from policy. Agent cannot be left blank.')); + return; + } + + $policy = policies_get_policy ($id, false, false); + $agent = db_get_row_filter('tagente', array('id_agente' => $id2)); + $policy_agent = db_get_row_filter('tpolicy_agents', array('id_policy' => $id ,'id_agent' => $id2)); + + if (empty ($policy)){ + returnError('error_policy', __('This policy does not exist.')); + return; + } + if (empty ($agent)){ + returnError('error_agent', __('This agent does not exist.')); + return; + } + if (empty ($policy_agent)){ + returnError('error_policy_agent', __('This agent does not exist in this policy.')); + return; + } + + $return = policies_change_delete_pending_agent($policy_agent['id']); + $data = __('Successfully added to delete pending id agent %d to id policy %d.', $id2, $id); + + if ($return === false) + returnError('error_delete_policy_agent', 'Could not be deleted id agent %d from id policy %d', $id2, $id); + else + returnData('string', array('type' => 'string', 'data' => $data)); + + +} + + /** * Create a new group. And return the id_group of the new group. * @@ -7008,7 +7066,6 @@ function api_set_update_user($id, $thrash2, $other, $thrash3) { } $cont = 0; - foreach ($fields_user as $field) { if ($other['data'][$cont] != "" and $field != "password") { $values[$field] = $other['data'][$cont]; @@ -9726,6 +9783,11 @@ function api_set_create_event($id, $trash1, $other, $returnType) { return; } $values['id_grupo'] = $other['data'][1]; + + if (groups_get_name($values['id_grupo']) === false) { + returnError('error_parameter', 'Group ID does not exist'); + return; + } } else { returnError('error_parameter', 'Group ID required.'); @@ -10069,7 +10131,7 @@ function api_get_netflow_get_summary ($discard_1, $discard_2, $params) { } //http://localhost/pandora_console/include/api.php?op=set&op2=validate_event_by_id&id=23&apipass=1234&user=admin&pass=pandora -function api_set_validate_event_by_id ($id, $trash1, $trash2, $returnType) { +function api_set_validate_event_by_id ($id, $trash1 = null, $trash2 = null, $returnType = 'string') { global $config; $data['type'] = 'string'; $check_id = db_get_value('id_evento', 'tevento', 'id_evento', $id); @@ -10088,7 +10150,7 @@ function api_set_validate_event_by_id ($id, $trash1, $trash2, $returnType) { 'ack_utimestamp' => $ack_utimestamp, 'estado' => 1 ); - + $result = db_process_sql_update('tevento', $values, array('id_evento' => $id)); if ($result === false) { @@ -11862,6 +11924,445 @@ function api_get_cluster_items ($cluster_id){ } } + +/** + * Create an event filter. + * + * @param string $id Name of event filter to add. + * @param $thrash1 Don't use. + * @param array $other it's array, $other as param is;;; + * ;;;;;;;; + * ;;;;;;; + * ; in this order + * and separator char (after text ; ) and separator (pass in param othermode as othermode=url_encode_separator_) + * + * example: api.php?op=set&op2=create_event_filter&id=test&other=||error|4|||1||12|||2018-12-09|2018-12-13|[%226%22]|[%2210%22,%226%22,%223%22]|1|10|||&other_mode=url_encode_separator_| + * + * + * @param $thrash3 Don't use + */ +function api_set_create_event_filter($name, $thrash1, $other, $thrash3) { + + if ($name == "") { + returnError('error_create_event_filter', + __('Error creating event filter. Event filter name cannot be left blank.')); + return; + } + + $event_w = check_acl ($config['id_user'], 0, "EW"); + $event_m = check_acl ($config['id_user'], 0, "EM"); + $access = ($event_w == true) ? 'EW' : (($event_m == true) ? 'EM' : 'EW'); + + $event_filter_name = $name; + + $user_groups = users_get_groups ($config['id_user'], "AR", true); + + $id_group_filter = (array_key_exists($other['data'][0], $user_groups)) ? $other['data'][0] : 0; + + $id_group = (array_key_exists($other['data'][1], $user_groups)) ? $other['data'][1] : 0; + + $event_type = (array_key_exists($other['data'][2], get_event_types ()) || $other['data'][2]=='') ? $other['data'][2] : ''; + + $severity = (array_key_exists($other['data'][3], get_priorities()) || $other['data'][3]==-1) ? $other['data'][3] : -1; + + $status = (array_key_exists($other['data'][4], events_get_all_status()) || $other['data'][4]==-1) ? $other['data'][4] : -1; + + if (!is_numeric($other['data'][6]) || empty($other['data'][6])) { + $text_agent = ''; + $id_agent = 0; + } + else { + $filter = array (); + + if ($id_group == 0) + $filter['id_grupo'] = array_keys ($user_groups); + else + $filter['id_grupo'] = $id_group; + + $filter[] = '(id_agente = '.$other["data"][6].')'; + $agent = agents_get_agents($filter, array ('id_agente')); + + if ($agent === false) + $text_agent = ''; + else { + $sql = sprintf('SELECT alias + FROM tagente + WHERE id_agente = %d', $agent[0]['id_agente']); + + $id_agent = $other["data"][6]; + $text_agent = db_get_value_sql($sql); + } + } + + $pagination = (in_array($other['data'][7], [20,25,50,100,200,500])) ? $other['data'][7] : 20; + + $users = users_get_user_users($config['id_user'], $access, users_can_manage_group_all()); + + $id_user_ack = (in_array($other['data'][9], $users)) ? $other['data'][9] : 0; + + $group_rep = ($other['data'][10] == 0 || $other['data'][10] == 1) ? $other['data'][10] : 0; + + $date_from = (preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/",$other['data'][11])) ? $other['data'][11] : '0000-00-00'; + + $date_to = (preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/",$other['data'][12])) ? $other['data'][12] : '0000-00-00'; + + $tag_with = (preg_match('/^\[(("\d+"((,|\])("\d+"))+)|"\d+")\]$/', io_safe_output($other['data'][13]))) ? $other['data'][13] : '[]'; + + $tag_without = (preg_match('/^\[(("\d+"((,|\])("\d+"))+)|"\d+")\]$/', io_safe_output($other['data'][14]))) ? $other['data'][14] : '[]'; + + $filter_only_alert = (in_array($other['data'][15], [-1,0,1])) ? $other['data'][15] : -1; + + if (!is_numeric($other['data'][16]) || empty($other['data'][16])) + $id_agent_module = 0; + else { + $groups = array(); + + $groups = users_get_groups($config['id_user'], "AW", false); + $groups = array_keys($groups); + + if (empty($groups)) { + $id_groups = 0; + } + else { + $id_groups = implode(',', $groups); + } + + $agents = db_get_all_rows_sql('SELECT id_agente + FROM tagente + WHERE id_grupo IN (' . $id_groups . ')'); + + if ($agents === false) $agents = array(); + + $id_agents = array(); + foreach ($agents as $agent) { + $id_agents[] = $agent['id_agente']; + } + + $filter = '(' . $other['data'][16] . ')'; + + $modules = agents_get_modules($id_agents, false, + (array('tagente_modulo.id_agente_modulo in' => $filter))); + + $id_agent_module = (array_key_exists($other['data'][16], $modules)) ? $other['data'][16] : 0; + } + + $values = array( + 'id_group_filter' => $id_group_filter, + 'id_group' => $id_group, + 'event_type' => $event_type, + 'severity' => $severity, + 'status' => $status, + 'search' => $other['data'][5], + 'text_agent' => $text_agent, + 'id_agent' => $id_agent, + 'pagination' => $pagination, + 'event_view_hr' => $other['data'][8], + 'id_user_ack' => $id_user_ack, + 'group_rep' => $group_rep, + 'date_from' => $date_from, + 'date_to' => $date_to, + 'tag_with' => $tag_with, + 'tag_without' => $tag_without, + 'filter_only_alert' => $filter_only_alert, + 'id_agent_module' => $id_agent_module, + 'source' => $other['data'][17], + 'id_extra' => $other['data'][18], + 'user_comment' => $other['data'][19] + ); + + $values['id_name'] = $event_filter_name; + + $id_filter = db_process_sql_insert('tevent_filter', $values); + + if ($id_filter === false) { + returnError('error_create_event_filter', __('Error creating event filter.')); + } + else { + returnData('string', array('type' => 'string', + 'data' => __('Event filter successfully created.'))); + } + +} + +/** + * Update an event filter. And return a message with the result of the operation. + * + * @param string $id_event_filter Id of the event filter to update. + * @param $thrash1 Don't use. + * @param array $other it's array, $other as param is ;;; + * ;;;;;;;; + * ;;;;;;; + * ; in this order + * and separator char (after text ; ) and separator (pass in param othermode as othermode=url_encode_separator_) + * + * example: + * + * api.php?op=set&op2=update_event_filter&id=198&other=new_name|||alert_recovered|||||||||||||||||&other_mode=url_encode_separator_%7C + * + * @param $thrash3 Don't use + */ +function api_set_update_event_filter($id_event_filter, $thrash1, $other, $thrash3) { + global $config; + + if (!check_acl($config['id_user'], 0, "LM")) { + returnError('forbidden', 'string'); + return; + } + + if ($id_event_filter == "") { + returnError('error_update_event_filter', + __('Error updating event filter. Event filter ID cannot be left blank.')); + return; + } + + $sql = "SELECT * FROM tevent_filter WHERE id_filter=$id_event_filter"; + $result_event_filter = db_get_row_sql($sql); + + if (!$result_event_filter) { + returnError('error_update_event_filter', + __('Error updating event filter. Event filter ID doesn\'t exist.')); + return; + } + + $values = array(); + + for ($i=0; $i<21; $i++) { + if ($other['data'][$i] != "") { + switch ($i) { + case 0: + $values['id_name'] = $other['data'][0]; + break; + case 1: + $user_groups = users_get_groups ($config['id_user'], "AR", true); + $values['id_group_filter'] = (array_key_exists($other['data'][1], $user_groups)) ? $other['data'][1] : 0; + break; + case 2: + $user_groups = users_get_groups ($config['id_user'], "AR", true); + $values['id_group'] = (array_key_exists($other['data'][2], $user_groups)) ? $other['data'][2] : 0; + break; + case 3: + $values['event_type'] = (array_key_exists($other['data'][3], get_event_types ()) || $other['data'][3]=='') ? $other['data'][3] : ''; + break; + case 4: + $values['severity'] = (array_key_exists($other['data'][4], get_priorities()) || $other['data'][4]==-1) ? $other['data'][4] : -1; + break; + case 5: + $values['status'] = (array_key_exists($other['data'][5], events_get_all_status()) || $other['data'][5]==-1) ? $other['data'][5] : -1; + break; + case 6: + $values['search'] = $other['data'][6]; + break; + case 7: + $user_groups = users_get_groups ($config['id_user'], "AR", true); + + if (!is_numeric($other['data'][7]) || empty($other['data'][7])) { + $values['text_agent'] = ''; + $values['id_agent'] = 0; + } + else { + + $filter = array (); + + if ($id_group == 0) + $filter['id_grupo'] = array_keys ($user_groups); + else + $filter['id_grupo'] = $id_group; + + $filter[] = '(id_agente = '.$other["data"][7].')'; + $agent = agents_get_agents($filter, array ('id_agente')); + + if ($agent === false) + $values['text_agent'] = ''; + else { + $sql = sprintf('SELECT alias + FROM tagente + WHERE id_agente = %d', $agent[0]['id_agente']); + + $values['id_agent'] = $other["data"][7]; + $values['text_agent'] = db_get_value_sql($sql); + } + } + break; + case 8: + $values['pagination'] = (in_array($other['data'][8], [20,25,50,100,200,500])) ? $other['data'][8] : 20; + break; + case 9: + $values['event_view_hr'] = $other['data'][9]; + break; + case 10: + + $event_w = check_acl ($config['id_user'], 0, "EW"); + $event_m = check_acl ($config['id_user'], 0, "EM"); + $access = ($event_w == true) ? 'EW' : (($event_m == true) ? 'EM' : 'EW'); + + $users = users_get_user_users($config['id_user'], $access, users_can_manage_group_all()); + + $values['id_user_ack'] = (in_array($other['data'][10], $users)) ? $other['data'][10] : 0; + break; + case 11: + $values['group_rep'] = ($other['data'][11] == 0 || $other['data'][11] == 1) ? $other['data'][11] : 0; + break; + case 12: + $values['date_from'] = (preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/",$other['data'][12])) ? $other['data'][12] : '0000-00-00'; + break; + case 13: + $values['date_to'] = (preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/",$other['data'][13])) ? $other['data'][13] : '0000-00-00'; + break; + case 14: + print_r("14444444"); + $values['tag_with'] = (preg_match('/^\[(("\d+"((,|\])("\d+"))+)|"\d+")\]$/', io_safe_output($other['data'][14]))) ? $other['data'][14] : '[]'; + break; + case 15: + print_r("1555555555"); + $values['tag_without'] = (preg_match('/^\[(("\d+"((,|\])("\d+"))+)|"\d+")\]$/', io_safe_output($other['data'][15]))) ? $other['data'][15] : '[]'; + break; + case 16: + $values['filter_only_alert'] = (in_array($other['data'][16], [-1,0,1])) ? $other['data'][16] : -1; + break; + case 17: + if (!is_numeric($other['data'][17]) || empty($other['data'][17])) + $values['id_agent_module'] = 0; + else { + $groups = array(); + + $groups = users_get_groups($config['id_user'], "AW", false); + $groups = array_keys($groups); + + if (empty($groups)) { + $id_groups = 0; + } + else { + $id_groups = implode(',', $groups); + } + + $agents = db_get_all_rows_sql('SELECT id_agente + FROM tagente + WHERE id_grupo IN (' . $id_groups . ')'); + + if ($agents === false) $agents = array(); + + $id_agents = array(); + foreach ($agents as $agent) { + $id_agents[] = $agent['id_agente']; + } + + $filter = '(' . $other['data'][17] . ')'; + + $modules = agents_get_modules($id_agents, false, + (array('tagente_modulo.id_agente_modulo in' => $filter))); + + $values['id_agent_module'] = (array_key_exists($other['data'][17], $modules)) ? $other['data'][17] : 0; + } + break; + case 18: + $values['source'] = $other['data'][18]; + break; + case 19: + $values['id_extra'] = $other['data'][19]; + break; + case 20: + print_r("adadadasds"); + $values['user_comment'] = $other['data'][20]; + break; + + } + } + } + + $result = db_process_sql_update ('tevent_filter', + $values, + array ('id_filter' => $id_event_filter)); + + if ($result === false) { + returnError('error_update_event_filter', __('Error updating event filter.')); + } + else { + returnData('string', array('type' => 'string', + 'data' => __('Event filter successfully updated.'))); + } + +} + + +/** + * Delete an event filter. And return a message with the result of the operation. + * + * @param string $id_template Id of the event filter to delete. + * @param $thrash1 Don't use. + * @param array $other Don't use + * + * example: + * + * api.php?op=set&op2=delete_event_filter&id=38 + * + * @param $thrash3 Don't use + */ +function api_set_delete_event_filter($id_event_filter, $thrash1, $other, $thrash3) { + + if ($id_event_filter == "") { + returnError('error_delete_event_filter', + __('Error deleting event_filter. Event filter ID cannot be left blank.')); + return; + } + + $result = db_process_sql_delete ('tevent_filter',array('id_filter' => $id_event_filter)); + + if ($result == 0) { + returnError('error_delete_event_filter', + __('Error deleting event filter.')); + } + else { + returnData('string', array('type' => 'string', + 'data' => __('Event filter successfully deleted.'))); + } +} + + +/** + * Get all event filters, and print all the result like a csv. + * + * @param $thrash1 Don't use. + * @param $thrash2 Don't use. + * @param array $other it's array, but only is available. + * example: + * + * api.php?op=get&op2=all_event_filters&return_type=csv&other=; + * + * @param $thrash3 Don't use. + */ +function api_get_all_event_filters($thrash1, $thrash2, $other, $thrash3) { + global $config; + + if (!isset($other['data'][0])) + $separator = ';'; // by default + else + $separator = $other['data'][0]; + + if (!check_acl($config["id_user"], 0, "LM")) { + returnError("forbidden", "csv"); + return; + } + + $filter = false; + + $sql = "SELECT * FROM tevent_filter"; + $event_filters = db_get_all_rows_sql($sql); + + if ($event_filters !== false) { + $data['type'] = 'array'; + $data['data'] = $event_filters; + } + + if (!$event_filters) { + returnError('error_get_all_event_filters', + __('Error getting all event filters.')); + } + else { + returnData('csv', $data, $separator); + } +} + + ///////////////////////////////////////////////////////////////////// // AUX FUNCTIONS ///////////////////////////////////////////////////////////////////// @@ -11881,6 +12382,231 @@ function util_api_check_agent_and_print_error($id_agent, $returnType, $access = return false; } +function api_get_user_info($thrash1, $thrash2, $other, $returnType) { + + $separator = ';'; + + $other = json_decode(base64_decode($other['data']),true); + + $sql = 'select * from tusuario where id_user = "'.$other[0]['id_user'].'" and password = "'.$other[0]['password'].'"'; + + $user_info = db_get_all_rows_sql($sql); + + if (count($user_info) > 0 and $user_info !== false) { + $data = array('type' => 'array', 'data' => $user_info); + returnData($returnType, $data, $separator); + } + else { + return 0; + } +} + + +/* + +This function receives different parameters to process one of these actions the logging process in our application from the records in the audit of pandora fms, to avoid concurrent access of administrator users, and optionally to prohibit access to non-administrator users: + +Parameter 0 + +The User ID that attempts the action is used to check the status of the application for access. + +Parameter 1 + +Login, logout, exclude, browse. + +These requests receive a response that we can treat as we consider, this function only sends answers, does not perform any action in your application, you must customize them. + +Login action: free (register our access), taken, denied (if you are not an administrator user and parameter four is set to 1, register the expulsion). + +Browse action: It has the same answers as login, but does not register anything in the audit. + +Logout action: It records the deslogeo but does not send a response. + +All other actions do not return a response, + +Parameter 2 + +IP address of the application is also used to check the status of the application for access. + +Parameter 3 + +Name of the application, it is also used to check the status of the application for access. + +Parameter 4 + +If you mark 1 you will avoid the access to the non-administrators users, returning the response `denied' and registering that expulsion in the audit of pandora fms. + +*/ + + + +function api_set_access_process($thrash1, $thrash2, $other, $returnType) { + if (defined ('METACONSOLE')) { + return; + } + + $other['data'] = explode('|',$other['data']); + + $sql = 'select id_usuario,utimestamp from tsesion where descripcion like "%'.$other['data'][2].'%" and accion like "%'.$other['data'][3].' Logon%" and id_usuario IN (select id_user from tusuario where is_admin = 1) and id_usuario != "'.$other['data'][0].'" order by utimestamp DESC limit 1'; + $audit_concurrence = db_get_all_rows_sql($sql); + $sql_user = 'select id_usuario,utimestamp from tsesion where descripcion like "%'.$other['data'][2].'%" and accion like "%'.$other['data'][3].' Logon%" and id_usuario IN (select id_user from tusuario where is_admin = 1) and id_usuario = "'.$other['data'][0].'" order by utimestamp DESC limit 1'; + $audit_concurrence_user = db_get_all_rows_sql($sql_user); + $sql2 = 'select id_usuario,utimestamp,accion from tsesion where descripcion like "%'.$other['data'][2].'%" and accion like "%'.$other['data'][3].' Logoff%" and id_usuario = "'.$audit_concurrence[0]['id_usuario'].'" order by utimestamp DESC limit 1'; + $audit_concurrence_2 = db_get_all_rows_sql($sql2); + + //The user trying to log in is an administrator + if(users_is_admin($other['data'][0])){ + //The admin user is trying to login + if($other['data'][1] == 'login'){ + // Check if there is an administrator user logged in prior to our last login + if($audit_concurrence[0]['utimestamp'] > $audit_concurrence_user[0]['utimestamp']){ + // Check if the administrator user logged in later to us has unlogged and left the node free + if($audit_concurrence[0]['utimestamp'] > $audit_concurrence_2[0]['utimestamp']){ + // The administrator user logged in later has not yet unlogged + returnData('string', array('type' => 'string', 'data' => 'taken')); + } + else{ + // The administrator user logged in later has already unlogged + returnData('string', array('type' => 'string', 'data' => 'free')); + } + } + else{ + // There is no administrator user who has logged in since then to log us in. + db_pandora_audit($other['data'][3].' Logon', 'Logged in '.$other['data'][3].' node '.$other['data'][2] , $other['data'][0]); + returnData('string', array('type' => 'string', 'data' => 'free')); + } + + } + elseif ($other['data'][1] == 'logout') { + // The administrator user wants to log out + db_pandora_audit($other['data'][3].' Logoff', 'Logout from '.$other['data'][3].' node '.$other['data'][2], $other['data'][0]); + } + elseif ($other['data'][1] == 'exclude') { + // The administrator user has ejected another administrator user who was logged in + db_pandora_audit($other['data'][3].' Logon', 'Logged in '.$other['data'][3].' node '.$other['data'][2] , $other['data'][0]); + db_pandora_audit($other['data'][3].' Logoff', 'Logout from '.$other['data'][3].' node '.$other['data'][2] , $audit_concurrence[0]['id_usuario']); + + } + //The admin user is trying to browse + elseif ($other['data'][1] == 'browse') { + // Check if there is an administrator user logged in prior to our last login + if($audit_concurrence[0]['utimestamp'] > $audit_concurrence_user[0]['utimestamp']){ + // Check if the administrator user logged in later to us has unlogged and left the node free + if($audit_concurrence[0]['utimestamp'] > $audit_concurrence_2[0]['utimestamp']){ + // The administrator user logged in later has not yet unlogged + returnData('string', array('type' => 'string', 'data' => $audit_concurrence[0]['id_usuario'])); + } + else{ + // The administrator user logged in later has already unlogged + returnData('string', array('type' => 'string', 'data' => 'free')); + } + } + else{ + // There is no administrator user who has logged in since then to log us in. + returnData('string', array('type' => 'string', 'data' => 'free')); + } + + } + elseif ($other['data'][1] == 'cancelled'){ + //The administrator user tries to log in having another administrator logged in, but instead of expelling him he cancels his log in. + db_pandora_audit($other['data'][3].' cancelled access', 'Cancelled access in '.$other['data'][3].' node '.$other['data'][2] , $other['data'][0]); + returnData('string', array('type' => 'string', 'data' => 'cancelled')); + } + +} +else{ + + if($other['data'][4] == 1){ + //The user trying to log in is not an administrator and is not allowed no admin access + db_pandora_audit($other['data'][3].' denied access', 'Denied access to non-admin user '.$other['data'][3].' node '.$other['data'][2] , $other['data'][0]); + returnData('string', array('type' => 'string', 'data' => 'denied')); + } + else{ + //The user trying to log in is not an administrator and is allowed no admin access + if($other['data'][1] == 'login'){ + //The user trying to login is not admin, can enter without concurrent use filter + db_pandora_audit($other['data'][3].' Logon', 'Logged in '.$other['data'][3].' node '.$other['data'][2] , $other['data'][0]); + returnData('string', array('type' => 'string', 'data' => 'free')); + + } + elseif ($other['data'][1] == 'logout') { + //The user trying to logoff is not admin + db_pandora_audit($other['data'][3].' Logoff', 'Logout from '.$other['data'][3].' node '.$other['data'][2], $other['data'][0]); + } + elseif ($other['data'][1] == 'browse'){ + //The user trying to browse in an app page is not admin, can enter without concurrent use filter + returnData('string', array('type' => 'string', 'data' => 'free')); + } + } + } +} + + +function api_get_traps($thrash1, $thrash2, $other, $returnType) { + + if (defined ('METACONSOLE')) { + return; + } + + $other['data'] = explode('|',$other['data']); + + $other['data'][1] = date("Y-m-d H:i:s",$other['data'][1]); + + $sql = 'SELECT * from ttrap where timestamp >= "'.$other['data'][1].'"'; + + // $sql = 'SELECT * from ttrap where source = "'.$other['data'][0].'" and timestamp >= "'.$other['data'][1].'"'; + + if($other['data'][4]){ + $other['data'][4] = date("Y-m-d H:i:s",$other['data'][4]); + $sql .= ' and timestamp <= "'.$other['data'][4].'"'; + } + + if($other['data'][2]){ + $sql .= ' limit '.$other['data'][2]; + } + + if($other['data'][3]){ + $sql .= ' offset '.$other['data'][3]; + } + + if($other['data'][5]){ + $sql .= ' and status = 0'; + } + + if(sizeof($other['data']) == 0){ + $sql = 'SELECT * from ttrap'; + } + + + $traps = db_get_all_rows_sql($sql); + + if($other['data'][6]){ + + foreach ($traps as $key => $value) { + + if(!strpos($value['oid_custom'],$other['data'][6]) && $other['data'][7] == 'false'){ + unset($traps[$key]); + } + + if(strpos($value['oid_custom'],$other['data'][6]) && $other['data'][7] == 'true'){ + unset($traps[$key]); + } + + } + + } + + $traps_json = json_encode($traps); + + if (count($traps) > 0 and $traps !== false) { + returnData('string', array('type' => 'string', 'data' => $traps_json)); + } + else { + return 0; + } + +} + function api_set_validate_traps ($id, $thrash2, $other, $thrash3) { if (defined ('METACONSOLE')) { @@ -11906,117 +12632,118 @@ function api_set_validate_traps ($id, $thrash2, $other, $thrash3) { } } - function api_set_delete_traps ($id, $thrash2, $other, $thrash3) { - - if (defined ('METACONSOLE')) { - return; - } - - if($id == 'all'){ - $result = db_process_sql ('delete from ttrap'); - } - else{ - $result = db_process_sql_delete('ttrap',array('id_trap' => $id)); - } - - if (is_error($result)) { - // TODO: Improve the error returning more info - returnError('error_delete_trap', __('Error in trap delete.')); - } - else { - returnData('string', - array('type' => 'string', - 'data' => __('Deleted traps.'))); - } - } - - function api_get_group_id_by_name($thrash1, $thrash2, $other, $thrash3) { - if (defined ('METACONSOLE')) { - return; - } - - $sql = sprintf('SELECT id_grupo - FROM tgrupo WHERE nombre = "'.$other['data'].'"'); - - $group_id = db_get_all_rows_sql($sql); - - if (count($group_id) > 0 and $group_id !== false) { - $data = array('type' => 'array', 'data' => $group_id); - - returnData('csv', $data, ';'); - } - else { - returnError('error_group_name', 'No groups retrieved.'); - } - } - - function api_get_timezone($thrash1, $thrash2, $other, $thrash3) { - if (defined ('METACONSOLE')) { - return; - } - - $sql = sprintf('SELECT value - FROM tconfig WHERE token = "timezone"'); - - $timezone = db_get_all_rows_sql($sql); - - if (count($timezone) > 0 and $timezone !== false) { - - $data = array('type' => 'string', 'data' => $timezone); - - returnData('string',array('type' => 'string','data' => $data['data'][0]['value'])); - - } - else { - returnError('error_timezone', 'No timezone retrieved.'); - } +function api_set_delete_traps ($id, $thrash2, $other, $thrash3) { + + if (defined ('METACONSOLE')) { + return; + } + + if($id == 'all'){ + $result = db_process_sql ('delete from ttrap'); + } + else{ + $result = db_process_sql_delete('ttrap',array('id_trap' => $id)); + } + + if (is_error($result)) { + // TODO: Improve the error returning more info + returnError('error_delete_trap', __('Error in trap delete.')); + } + else { + returnData('string', + array('type' => 'string', + 'data' => __('Deleted traps.'))); } + } + - function api_get_language($thrash1, $thrash2, $other, $thrash3) { - if (defined ('METACONSOLE')) { - return; - } - - $sql = sprintf('SELECT value - FROM tconfig WHERE token = "language"'); - - $language = db_get_all_rows_sql($sql); - - if (count($language) > 0 and $language !== false) { - - $data = array('type' => 'string', 'data' => $language); - - returnData('string',array('type' => 'string','data' => $data['data'][0]['value'])); - - } - else { - returnError('error_language', 'No language retrieved.'); - } - } - function api_get_session_timeout($thrash1, $thrash2, $other, $thrash3) { - if (defined ('METACONSOLE')) { - return; - } - - $sql = sprintf('SELECT value - FROM tconfig WHERE token = "session_timeout"'); - - $language = db_get_all_rows_sql($sql); - - if (count($language) > 0 and $language !== false) { +function api_get_group_id_by_name($thrash1, $thrash2, $other, $thrash3) { + if (defined ('METACONSOLE')) { + return; + } - $data = array('type' => 'string', 'data' => $language); - - returnData('string',array('type' => 'string','data' => $data['data'][0]['value'])); - - } - else { - returnError('error_session_timeout', 'No session timeout retrieved.'); - } - } + $sql = sprintf('SELECT id_grupo + FROM tgrupo WHERE nombre = "'.$other['data'].'"'); + + $group_id = db_get_all_rows_sql($sql); + + if (count($group_id) > 0 and $group_id !== false) { + $data = array('type' => 'array', 'data' => $group_id); + returnData('csv', $data, ';'); + } + else { + returnError('error_group_name', 'No groups retrieved.'); + } +} + +function api_get_timezone($thrash1, $thrash2, $other, $thrash3) { + if (defined ('METACONSOLE')) { + return; + } + + $sql = sprintf('SELECT value + FROM tconfig WHERE token = "timezone"'); + + $timezone = db_get_all_rows_sql($sql); + + if (count($timezone) > 0 and $timezone !== false) { + $data = array('type' => 'string', 'data' => $timezone); + + returnData('string',array('type' => 'string','data' => $data['data'][0]['value'])); + + } + else { + returnError('error_timezone', 'No timezone retrieved.'); + } +} + +function api_get_language($thrash1, $thrash2, $other, $thrash3) { + if (defined ('METACONSOLE')) { + return; + } + + $sql = sprintf('SELECT value + FROM tconfig WHERE token = "language"'); + + $language = db_get_all_rows_sql($sql); + + if (count($language) > 0 and $language !== false) { + + $data = array('type' => 'string', 'data' => $language); + + returnData('string',array('type' => 'string','data' => $data['data'][0]['value'])); + + } + else { + returnError('error_language', 'No language retrieved.'); + } +} + +function api_get_session_timeout($thrash1, $thrash2, $other, $thrash3) { + if (defined ('METACONSOLE')) { + return; + } + + $sql = sprintf('SELECT value + FROM tconfig WHERE token = "session_timeout"'); + + $language = db_get_all_rows_sql($sql); + + if (count($language) > 0 and $language !== false) { + + $data = array('type' => 'string', 'data' => $language); + + returnData('string',array('type' => 'string','data' => $data['data'][0]['value'])); + + } + else { + returnError('error_session_timeout', 'No session timeout retrieved.'); + } +} + function api_get_users($thrash1, $thrash2, $other, $returnType) { global $config; @@ -12042,8 +12769,4 @@ function api_get_users($thrash1, $thrash2, $other, $returnType) { } } - - - - ?> diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index bd0c78bd76..17f6d9b345 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -312,6 +312,8 @@ function config_update_config () { $error_update[] = __('Autocreate profile group'); if (!config_update_value ('default_assign_tags', implode(",",get_parameter ('default_assign_tags')))) $error_update[] = __('Autocreate profile tags'); + if (!config_update_value ('default_no_hierarchy', (int)get_parameter ('default_no_hierarchy'))) + $error_update[] = __('Automatically assigned no hierarchy'); if (!config_update_value ('autocreate_blacklist', get_parameter ('autocreate_blacklist'))) $error_update[] = __('Autocreate blacklist'); @@ -1452,7 +1454,10 @@ function config_process_config () { if (!isset ($config['default_assign_tags'])) { config_update_value ( 'default_assign_tags', ''); } - + if (!isset ($config['default_no_hierarchy'])) { + config_update_value ('default_no_hierarchy', 0); + } + if (!isset ($config['ldap_server'])) { config_update_value ( 'ldap_server', 'localhost'); } diff --git a/pandora_console/include/functions_groups.php b/pandora_console/include/functions_groups.php index bfc5d3af55..be2c23518d 100644 --- a/pandora_console/include/functions_groups.php +++ b/pandora_console/include/functions_groups.php @@ -441,7 +441,7 @@ function groups_get_all($groupWithAgents = false) { * Get all groups recursive from an initial group. * * @param int Id of the parent group - * @param bool Whether to return All group or not + * @param bool Whether to force recursive search ignoring propagation (true) or not (false) * * @return Array with all result groups */ @@ -451,10 +451,11 @@ function groups_get_id_recursive($id_parent, $all = false) { $return = array_merge($return, array($id_parent)); //Check propagate - $id = db_get_value_filter('id_grupo', 'tgrupo', array('id_grupo' => $id_parent, 'propagate' => 1)); + $propagate = db_get_value_filter('propagate', 'tgrupo', array('id_grupo' => $id_parent)); - if (($id !== false) || $all) { + if (($propagate != 1) || $all) { $children = db_get_all_rows_filter("tgrupo", array('parent' => $id_parent, 'disabled' => 0), array('id_grupo')); + if ($children === false) { $children = array(); } diff --git a/pandora_console/include/functions_groupview.php b/pandora_console/include/functions_groupview.php index e9b7ca7c1d..55256313b2 100644 --- a/pandora_console/include/functions_groupview.php +++ b/pandora_console/include/functions_groupview.php @@ -68,6 +68,7 @@ function groupview_get_modules_counters($groups_ids = false) { ta.id_grupo AS g FROM $table ta WHERE ta.id_grupo IN ($groups_ids) + AND ta.disabled = 0 GROUP BY ta.id_grupo UNION ALL SELECT SUM(ta.normal_count) AS module_normal, diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index 16e222ca5c..06257a5457 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -735,8 +735,11 @@ function html_print_extended_select_for_post_process($name, $selected = '', $selected_float = (float)$selected; $found = false; - if (array_key_exists(number_format($selected, 14, '.', ','), $fields)) - $found = true; + if($selected){ + if (array_key_exists(number_format($selected, 14, '.', ','), $fields)) { + $found = true; + } + } if (!$found) { $fields[$selected] = floatval($selected); @@ -1017,7 +1020,7 @@ function html_print_input_text_extended ($name, $value, $id, $alt, $size, $maxle ++$idcounter; $valid_attrs = array ("accept", "disabled", "maxlength", - "name", "readonly", "size", "value", "accesskey", + "name", "readonly", "placeholder", "size", "value", "accesskey", "class", "dir", "id", "lang", "style", "tabindex", "title", "xml:lang", "onfocus", "onblur", "onselect", "onchange", "onclick", "ondblclick", "onmousedown", diff --git a/pandora_console/include/functions_io.php b/pandora_console/include/functions_io.php index 57603eca0b..687445bb7f 100755 --- a/pandora_console/include/functions_io.php +++ b/pandora_console/include/functions_io.php @@ -375,8 +375,8 @@ function __ ($string /*, variable arguments */) { global $config; static $extensions_cache = array(); - if( !isset($config["id_user"]) && count($extensions_cache) > 0 ) { - if (array_key_exists($config["id_user"], $extensions_cache)) { + if( isset($config["id_user"]) ) { + if ( count($extensions_cache) > 0 && array_key_exists($config["id_user"], $extensions_cache)) { $extensions = $extensions_cache[$config["id_user"]]; } else { @@ -385,8 +385,9 @@ function __ ($string /*, variable arguments */) { } } else{ - $extension =null; + $extensions=null; } + if (empty($extensions)) $extensions = array(); diff --git a/pandora_console/include/functions_profile.php b/pandora_console/include/functions_profile.php index 01d876697d..292d2892a7 100644 --- a/pandora_console/include/functions_profile.php +++ b/pandora_console/include/functions_profile.php @@ -79,14 +79,10 @@ function profile_create_user_profile ($id_user, $tags = '', $no_hierarchy = false ) { - global $config; if (empty ($id_profile) || $id_group < 0) - return false; - - // Secondary server is an enterprise function - if (!enterprise_installed() && $no_hierarchy) return false; + return false; // Checks if the user exists $result_user = users_get_user_by_id($id_user); diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php index 72a222becd..a4be0d445e 100755 --- a/pandora_console/include/functions_treeview.php +++ b/pandora_console/include/functions_treeview.php @@ -278,6 +278,11 @@ function treeview_printModuleTable($id_module, $server_data = false, $no_head = )); $salida = ui_get_snapshot_image($link, $is_snapshot) . '  '; } + + if($salida !== NULL){ + $last_data_str = html_print_image('images/clock2.png', true, array('title' => $last_data["timestamp"], 'width' => '18px')); + } + $last_data_str .= $salida; } else { diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js index 7067e1d560..e69fb155e0 100644 --- a/pandora_console/include/graphs/flot/pandora.flot.js +++ b/pandora_console/include/graphs/flot/pandora.flot.js @@ -362,10 +362,11 @@ function pandoraFlotHBars(graph_id, values, labels, water_mark, tickFormatter: xFormatter, }, yaxis: { - color: tick_color, - axisLabelUseCanvas: true, - axisLabelFontSizePixels: font_size, - axisLabelFontFamily: font+'Font', + font: { + size: font_size + 2, + color: 'rgb(84, 84, 84)', + family: font+'Font' + }, ticks: yFormatter, }, legend: { @@ -417,7 +418,7 @@ function pandoraFlotHBars(graph_id, values, labels, water_mark, div_attributes += "min-height: 2.5em;"; } - div_attributes += '" title="'+title+'" class="'+font+'" '+ ' style="overflow: hidden;"'; + div_attributes += '" title="'+title+'" style="overflow: hidden;"'; format.push([i,'
' + label diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php index 592e6f173b..46191aed93 100644 --- a/pandora_console/include/graphs/functions_flot.php +++ b/pandora_console/include/graphs/functions_flot.php @@ -412,11 +412,11 @@ function flot_pie_chart ($values, $labels, $width, $height, $water_mark, include_javascript_dependencies_flot_graph(); $return .= ""; return $return; @@ -476,11 +476,11 @@ function flot_custom_pie_chart ($graph_values, $colors = implode($separator, $temp_colors); $return .= ""; return $return; @@ -577,10 +577,10 @@ function flot_hcolumn_chart ($graph_data, $width, $height, $water_mark, $font = // Javascript code $return .= ""; return $return; @@ -668,7 +668,7 @@ function flot_vcolumn_chart ($graph_data, $width, $height, $color, $legend, $lon // Javascript code $return .= ""; return $return; @@ -843,7 +843,9 @@ function flot_slicesbar_graph ( // Javascript code $return .= ""; diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js index 29728984e1..f33a3b5e68 100644 --- a/pandora_console/include/graphs/pandora.d3.js +++ b/pandora_console/include/graphs/pandora.d3.js @@ -1332,7 +1332,7 @@ function print_phases_donut (recipient, phases) { var svg = d3.select(recipient) .append("svg") .attr("width", 800) - .attr("height", 400) + .attr("height", 500) .append("g"); svg.append("g") @@ -1361,7 +1361,7 @@ function print_phases_donut (recipient, phases) { .outerRadius(radius * 0.9); width = 800; - height = 400; + height = 500; svg.attr("transform", "translate(" + width / 2 + "," + height / 2 + ")"); var key = function(d){ return d.data.label; }; @@ -1440,6 +1440,8 @@ function print_phases_donut (recipient, phases) { return d.startAngle + (d.endAngle - d.startAngle)/2; } + var ex = 1; + var sum = 0; text.transition().duration(0) .attrTween("transform", function(d) { this._current = this._current || d; @@ -1447,8 +1449,26 @@ function print_phases_donut (recipient, phases) { this._current = interpolate(0); return function(t) { var d2 = interpolate(t); - var pos = outerArc.centroid(d2); - pos[0] = radius * (midAngle(d2) < Math.PI ? 1 : -1); + + //fix for labels of a very small portion increase the + //height of the label so that they do not overlap + if( ( d2.endAngle - d2.startAngle ) < 0.1){ + var pos = outerArc.centroid(d2); + if (ex%2==0){ + pos[0] = 150; + } + else{ + pos[0] = -150; + sum++; + } + pos[1] = pos[1] - (35*sum); + ex++; + } + else{ + var pos = outerArc.centroid(d2); + pos[0] = radius * (midAngle(d2) < Math.PI ? 1 : -1); + } + return "translate("+ pos +")"; }; }) @@ -1458,6 +1478,17 @@ function print_phases_donut (recipient, phases) { this._current = interpolate(0); return function(t) { var d2 = interpolate(t); + + //fix for labels of a very small portion increase the + //height of the label so that they do not overlap + if( ( d2.endAngle - d2.startAngle ) < 0.1){ + if (ex%2==0){ + return "start"; + } + else{ + return "end"; + } + } return midAngle(d2) < Math.PI ? "start":"end"; }; }); @@ -1468,10 +1499,12 @@ function print_phases_donut (recipient, phases) { /* ------- SLICE TO TEXT POLYLINES -------*/ var polyline = svg.select(".lines").selectAll("polyline") .data(pie(data), key); - + polyline.enter() .append("polyline"); + var ex2 = 1; + var sum2 = 0; polyline.transition().duration(0) .attrTween("points", function(d){ this._current = this._current || d; @@ -1479,16 +1512,33 @@ function print_phases_donut (recipient, phases) { this._current = interpolate(0); return function(t) { var d2 = interpolate(t); - var pos = outerArc.centroid(d2); - pos[0] = radius * 0.95 * (midAngle(d2) < Math.PI ? 1 : -1); + + //fix for labels of a very small portion increase the + //height of the label so that they do not overlap + if( ( d2.endAngle - d2.startAngle ) < 0.1){ + var pos = outerArc.centroid(d2); + if (ex2%2==0){ + pos[0] = 150 * 0.95; + } + else{ + pos[0] = -150 * 0.95; + sum2++; + } + pos[1] = pos[1] - (30*sum2); + ex2++; + } + else{ + var pos = outerArc.centroid(d2); + pos[0] = radius * 0.95 * (midAngle(d2) < Math.PI ? 1 : -1); + } return [arc.centroid(d2), outerArc.centroid(d2), pos]; - }; + }; }) .style("stroke", "black") .style("opacity", ".3") .style("stroke-width", "2px") .style("fill", "none"); - + polyline.exit() .remove(); } @@ -2331,4 +2381,4 @@ var digitPattern = [ setTimeout(tick, 1000 - now % 1000); })(); -} \ No newline at end of file +} diff --git a/pandora_console/include/help/en/help_plugin_macros.php b/pandora_console/include/help/en/help_plugin_macros.php index 1660c45e13..6d1e508b21 100644 --- a/pandora_console/include/help/en/help_plugin_macros.php +++ b/pandora_console/include/help/en/help_plugin_macros.php @@ -31,10 +31,10 @@ Hidden this macros because they cannot edit in the module form -->
  • _plugin_parameters_ : Plug-in Parameters of the module.
    • -
  • _name_tag_ : Nombre de los tags asociados al módulo.
    • -
  • _email_tag_ : Emails asociados a los tags de módulos.
    • -
  • _phone_tag_ : Teléfonos asociados a los tags de módulos.
    • -
  • _moduletags_ : Teléfonos asociados a los tags de módulos.
    • +
  • _name_tag_ : Names of the tags associated to the module.
    • +
  • _email_tag_ : Emails associated to module tags.
    • +
  • _phone_tag_ : Phone numbers associated to module tags.
    • +
  • _moduletags_ : URLs associated to module tags.
  • _agentcustomfield_n_: Agent custom field number n (eg. _agentcustomfield_9_).

    • diff --git a/pandora_console/include/help/es/help_plugin_macros.php b/pandora_console/include/help/es/help_plugin_macros.php index 701d15f35e..77c97aa4d7 100644 --- a/pandora_console/include/help/es/help_plugin_macros.php +++ b/pandora_console/include/help/es/help_plugin_macros.php @@ -30,9 +30,9 @@ Hidden this macros because they cannot edit in the module form -->

  • _plugin_parameters_ : Parámetros del Plug-in del módulo.
    • -
  • _name_tag_ : Names of the tags associated to the module.
    • -
  • _email_tag_ : Emails associated to the module tags.
    • -
  • _phone_tag_ : Phone numbers associated to the module tags.
    • -
  • _moduletags_ : URLs associated to the module tags.
    • +
  • _name_tag_ : Nombre de los tags asociados al módulo.
    • +
  • _email_tag_ : Emails asociados a los tags de módulos.
    • +
  • _phone_tag_ : Teléfonos asociados a los tags de módulos.
    • +
  • _moduletags_ : URLs asociadas a los tags de módulos.
  • _agentcustomfield_n_: Campo personalizado número n del agente (eg. _agentcustomfield_9_).
    • diff --git a/pandora_console/include/javascript/jquery.pandora.js b/pandora_console/include/javascript/jquery.pandora.js index 7cc18ec790..bd0da308c4 100644 --- a/pandora_console/include/javascript/jquery.pandora.js +++ b/pandora_console/include/javascript/jquery.pandora.js @@ -26,7 +26,8 @@ $.fn.showMessage = function (msg) { return $(this).hide ().empty () - .text (msg) + // here, previously .text (msg) + .html (msg) .slideDown (); }; }) (jQuery); diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js index 2b323a55f1..1ca0759801 100644 --- a/pandora_console/include/javascript/pandora.js +++ b/pandora_console/include/javascript/pandora.js @@ -594,12 +594,51 @@ function post_process_select_init_unit(name,selected) { function post_process_select_events_unit(name,selected) { $('.' + name + '_toggler').click(function() { - $('#' + name + '_select option[value=none]').attr("selected",true); - $('#text-' + name + '_text').val(""); + var value = $('#text-' + name + '_text').val(); + + var count = $('#' + name + '_select option') + .filter(function(i, item) { + + if ($(item).val() == value) + return true; + else return false; + }) + .length; + + if (count != 1) { + $('#' + name + '_select') + .append($("