From 7e649b78b3c139516d9b7fedda373bdf823de2a2 Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 9 Aug 2017 11:29:16 +0200 Subject: [PATCH 01/50] wux new form --- .../godmode/agentes/module_manager_editor.php | 56 ++++++++++++++++++- .../agentes/module_manager_editor_common.php | 26 --------- .../include/javascript/pandora_modules.js | 24 ++++++++ pandora_console/include/styles/pandora.css | 5 ++ 4 files changed, 83 insertions(+), 28 deletions(-) diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php index fb77e9c5c6..a330ef8d03 100644 --- a/pandora_console/godmode/agentes/module_manager_editor.php +++ b/pandora_console/godmode/agentes/module_manager_editor.php @@ -193,7 +193,10 @@ if ($id_agent_module) { $id_plugin = $module['id_plugin']; $post_process = $module['post_process']; $prediction_module = $module['prediction_module']; + $custom_integer_1 = $module ['custom_integer_1']; $custom_integer_2 = $module ['custom_integer_2']; + $custom_string_1 = $module ['custom_string_1']; + $custom_string_2 = $module ['custom_string_2']; $max_timeout = $module['max_timeout']; $max_retries = $module['max_retries']; $custom_id = $module['custom_id']; @@ -301,7 +304,10 @@ else { $quiet_module = 0; $unit = ''; $prediction_module = ''; + $custom_integer_1 = 0; $custom_integer_2 = 0; + $custom_string_1 = ''; + $custom_string_2 = ''; $id_plugin = ''; $id_export = ''; $disabled = "0"; @@ -509,15 +515,18 @@ echo ''; // TODO: Change to the ui_print_error system echo '
'; + html_print_table ($table_simple); ui_toggle(html_print_table ($table_advanced, true), __('Advanced options')); ui_toggle(html_print_table ($table_macros, true), __('Custom macros') . ui_print_help_icon ('module_macros', true)); -ui_toggle(html_print_table ($table_new_relations, true) . - html_print_table ($table_relations, true), __('Module relations')); +if($moduletype != 13){ + ui_toggle(html_print_table ($table_new_relations, true) . + html_print_table ($table_relations, true), __('Module relations')); +} // Submit echo '
'; @@ -571,6 +580,9 @@ var no_plugin_lang = ""; $(document).ready (function () { configure_modules_form (); + + + $("#module_form").submit(function() { if (typeof(check_remote_conf) != 'undefined') { if (check_remote_conf) { @@ -619,6 +631,46 @@ $(document).ready (function () { $("#id_module_type").change (function () { checkKeepaliveModule(); }); + }); + +function handleFileSelect() { + //clear texarea + $('#textarea_custom_string_1').empty(); + $('#mssg_error_div').empty(); + + //messages error + err_msg_1 = ""; + err_msg_2 = ""; + err_msg_3 = ""; + err_msg_4 = ""; + + if (!window.File || !window.FileReader || !window.FileList || !window.Blob) { + $('#mssg_error_div').append(err_msg_1); + return; + } + + input = document.getElementById('file-file_html_text'); + + if (!input) { + $('#mssg_error_div').append(err_msg_2); + } + else if (!input.files) { + $('#mssg_error_div').append(err_msg_3); + } + else if (!input.files[0]) { + $('#mssg_error_div').append(err_msg_4); + } + else { + file = input.files[0]; + fr = new FileReader(); + fr.onload = receivedText; + fr.readAsText(file); + } +} + +function receivedText() { + document.getElementById('textarea_custom_string_1').appendChild(document.createTextNode(fr.result)); +} /* ]]> */ diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index dfcff7adc9..c2b8a0c7b1 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -978,32 +978,6 @@ function advanced_option_dynamic() { } } -//Add a new module macro -function add_macro () { - var macro_count = parseInt($("#hidden-module_macro_count").val()); - var delete_icon = ''; - - // Add inputs for the new macro - $("#module_macros").append('Name \ - \ - Value \ - \ - ' + delete_icon + ''); - - // Update the macro count - $("#hidden-module_macro_count").val(macro_count + 1); -} - -// Delete an existing module macro -function delete_macro (num) { - if ($("#module_macros-" + num).length) { - $("#module_macros-" + num).remove(); - } - - // Do not decrease the macro counter or new macros may overlap existing ones! -} - - /* Relationship javascript */ // Change the modules autocomplete input depending on the result of the agents autocomplete input diff --git a/pandora_console/include/javascript/pandora_modules.js b/pandora_console/include/javascript/pandora_modules.js index cfba698db9..d08810aca7 100644 --- a/pandora_console/include/javascript/pandora_modules.js +++ b/pandora_console/include/javascript/pandora_modules.js @@ -899,3 +899,27 @@ function delete_macro_local_component(prefix) { var $row2 = $('#'+prefix+nrow2).remove(); } +//Add a new module macro +function add_macro () { + var macro_count = parseInt($("#hidden-module_macro_count").val()); + var delete_icon = ''; + + // Add inputs for the new macro + $("#module_macros").append('Name \ + \ + Value \ + \ + ' + delete_icon + ''); + + // Update the macro count + $("#hidden-module_macro_count").val(macro_count + 1); +} + +// Delete an existing module macro +function delete_macro (num) { + if ($("#module_macros-" + num).length) { + $("#module_macros-" + num).remove(); + } + + // Do not decrease the macro counter or new macros may overlap existing ones! +} diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 9d7deb64db..9537114e0e 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -4186,4 +4186,9 @@ div#footer_help{ .graph_conteiner_inside > div > .nodata_container{ background-size: 120px 80px !important; +} + +#mssg_error_div{ + color: red; + font-size: 12px; } \ No newline at end of file From 788cb8cbd8ce3340f31893df9cb73c674efcbe3c Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 9 Aug 2017 12:08:52 +0200 Subject: [PATCH 02/50] fixed errors in form wux --- pandora_console/godmode/agentes/configurar_agente.php | 2 +- pandora_console/godmode/agentes/module_manager_editor.php | 2 +- pandora_console/include/constants.php | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index c5ee3b6c88..dd7123e781 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -975,7 +975,7 @@ if ($update_module || $create_module) { $custom_string_1 = (string) get_parameter ('custom_string_1', $custom_string_1_default); $custom_string_2 = (string) get_parameter ('custom_string_2', $custom_string_2_default); $custom_string_3 = (string) get_parameter ('custom_string_3', $custom_string_3_default); - $custom_integer_1 = (int) get_parameter ('prediction_module', $custom_integer_1_default); + $custom_integer_1 = (int) get_parameter ('custom_integer_1', $custom_integer_1_default); $custom_integer_2 = (int) get_parameter ('custom_integer_2', $custom_integer_2_default); // Get macros diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php index a330ef8d03..462fa5471d 100644 --- a/pandora_console/godmode/agentes/module_manager_editor.php +++ b/pandora_console/godmode/agentes/module_manager_editor.php @@ -183,7 +183,7 @@ if ($id_agent_module) { // Security level Could be noAuthNoPriv | authNoPriv | authPriv $snmp3_security_level = $module["custom_string_3"]; - + $ip_target = $module['ip_target']; $disabled = $module['disabled']; $id_export = $module['id_export']; diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php index a61bfedf49..82cd88aa41 100644 --- a/pandora_console/include/constants.php +++ b/pandora_console/include/constants.php @@ -351,6 +351,7 @@ define('SERVER_TYPE_ENTERPRISE_SATELLITE', 13); define('SERVER_TYPE_ENTERPRISE_TRANSACTIONAL', 14); define('SERVER_TYPE_MAINFRAME', 15); define('SERVER_TYPE_SYNC', 16); +define('SERVER_TYPE_WUX', 17); /* REPORTS */ define('REPORT_TOP_N_MAX', 1); From 1d7d55a451a8e5ba8e19e185b089d5b30a38631e Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 9 Aug 2017 13:27:51 +0200 Subject: [PATCH 03/50] fixed errors in form wux --- pandora_console/extras/mr/6.sql | 7 +++++++ .../extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 6 ++++++ .../godmode/agentes/configurar_agente.php | 12 ++++++++++-- pandora_console/include/constants.php | 1 + pandora_console/pandoradb_data.sql | 1 + 5 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 pandora_console/extras/mr/6.sql diff --git a/pandora_console/extras/mr/6.sql b/pandora_console/extras/mr/6.sql new file mode 100644 index 0000000000..5e459a2622 --- /dev/null +++ b/pandora_console/extras/mr/6.sql @@ -0,0 +1,7 @@ +START TRANSACTION; + +ALTER TABLE tagente MODIFY COLUMN cascade_protection_module int(10) unsigned NOT NULL default '0'; + +INSERT INTO tmodule VALUES (8, 'Wux module'); + +COMMIT; 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 b3174434db..5c004155ac 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 @@ -1415,3 +1415,9 @@ ALTER TABLE tgraph_source ADD COLUMN id_server int(11) UNSIGNED NOT NULL default -- --------------------------------------------------------------------- ALTER TABLE tserver_export_data MODIFY `module_name` varchar(600) BINARY NOT NULL default ''; + +-- --------------------------------------------------------------------- +-- Table `tmodule` +-- --------------------------------------------------------------------- + +INSERT INTO tmodule VALUES (8, 'Wux module'); \ No newline at end of file diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index dd7123e781..6b4045bcb5 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -972,10 +972,18 @@ if ($update_module || $create_module) { $custom_integer_1_default = $module['custom_integer_1']; $custom_integer_2_default = $module['custom_integer_2']; } - $custom_string_1 = (string) get_parameter ('custom_string_1', $custom_string_1_default); + + if($id_module_type == MODULE_WUX){ + $custom_string_1 = base64_encode((string) get_parameter ('custom_string_1', $custom_string_1_default)); + $custom_integer_1 = (int) get_parameter ('custom_integer_1', $custom_integer_1_default); + } + else{ + $custom_string_1 = (string) get_parameter ('custom_string_1', $custom_string_1_default); + $custom_integer_1 = (int) get_parameter ('prediction_module', $custom_integer_1_default); + } + $custom_string_2 = (string) get_parameter ('custom_string_2', $custom_string_2_default); $custom_string_3 = (string) get_parameter ('custom_string_3', $custom_string_3_default); - $custom_integer_1 = (int) get_parameter ('custom_integer_1', $custom_integer_1_default); $custom_integer_2 = (int) get_parameter ('custom_integer_2', $custom_integer_2_default); // Get macros diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php index 82cd88aa41..f039a90504 100644 --- a/pandora_console/include/constants.php +++ b/pandora_console/include/constants.php @@ -311,6 +311,7 @@ define ('MODULE_PLUGIN', 4); define ('MODULE_PREDICTION', 5); define ('MODULE_WMI', 6); define ('MODULE_WEB', 7); +define ('MODULE_WUX', 8); /* Type of Modules of Prediction */ define ('MODULE_PREDICTION_SERVICE', 2); diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index c36186aff9..9438ccea8a 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -344,6 +344,7 @@ INSERT INTO tmodule VALUES (4,'Plugin module'); INSERT INTO tmodule VALUES (5,'Prediction module'); INSERT INTO tmodule VALUES (6,'WMI module'); INSERT INTO tmodule VALUES (7, 'Web module'); +INSERT INTO tmodule VALUES (8, 'Wux module'); INSERT INTO `tnetwork_component` (`id_nc`, `name`, `description`, `id_group`, `type`, `max`, `min`, `module_interval`, `tcp_port`, `tcp_send`, `tcp_rcv`, `snmp_community`, `snmp_oid`, `id_module_group`, `id_modulo`, `id_plugin`, `plugin_user`, `plugin_pass`, `plugin_parameter`, `max_timeout`, `history_data`, `min_warning`, `max_warning`, `str_warning`, `min_critical`, `max_critical`, `str_critical`, `min_ff_event`, `custom_string_1`, `custom_string_2`, `custom_string_3`, `custom_integer_1`, `custom_integer_2`, `post_process`, `wizard_level`, `critical_instructions`, `warning_instructions`, `unknown_instructions`, `tags`, `disabled_types_event`, `module_macros`) VALUES (1,'OS Total process','Total process in Operating System (UNIX MIB)',13,15,0,0,300,0,'','','public','HOST-RESOURCES-MIB::hrSystemProcesses.0 ',4,2,0,NULL,NULL,NULL,0,1,0.00,0.00,NULL,0.00,0.00,NULL,0,NULL,NULL,NULL,0,0,0.0000000000000,'basic','','','','','',''); INSERT INTO `tnetwork_component` (`id_nc`, `name`, `description`, `id_group`, `type`, `max`, `min`, `module_interval`, `tcp_port`, `tcp_send`, `tcp_rcv`, `snmp_community`, `snmp_oid`, `id_module_group`, `id_modulo`, `id_plugin`, `plugin_user`, `plugin_pass`, `plugin_parameter`, `max_timeout`, `history_data`, `min_warning`, `max_warning`, `str_warning`, `min_critical`, `max_critical`, `str_critical`, `min_ff_event`, `custom_string_1`, `custom_string_2`, `custom_string_3`, `custom_integer_1`, `custom_integer_2`, `post_process`, `wizard_level`, `critical_instructions`, `warning_instructions`, `unknown_instructions`, `tags`, `disabled_types_event`, `module_macros`) VALUES (2,'OS CPU Load (1 min)','CPU Load in Operating System (UNIX MIB)',13,15,0,0,300,0,'','','public','UCD-SNMP-MIB::laLoad.1',4,2,0,NULL,NULL,NULL,0,1,0.00,0.00,NULL,0.00,0.00,NULL,0,NULL,NULL,NULL,0,0,0.0000000000000,'basic','','','','','',''); From 2f069c37dc42b4a570116716e582f52983945828 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Fri, 11 Aug 2017 11:08:40 +0200 Subject: [PATCH 04/50] Add an alpha version of the WUXServer. --- pandora_console/install.php | 983 -------------------- pandora_server/conf/pandora_server.conf.new | 9 + pandora_server/lib/PandoraFMS/Config.pm | 17 + pandora_server/lib/PandoraFMS/Core.pm | 2 +- pandora_server/lib/PandoraFMS/Tools.pm | 2 + 5 files changed, 29 insertions(+), 984 deletions(-) delete mode 100644 pandora_console/install.php diff --git a/pandora_console/install.php b/pandora_console/install.php deleted file mode 100644 index b9549887a7..0000000000 --- a/pandora_console/install.php +++ /dev/null @@ -1,983 +0,0 @@ - - - - - Pandora FMS - Installation Wizard - - - - - - - - - - - - - -
- -
- - - -"; - echo " $label "; - echo ""; - if (!extension_loaded($ext)) { - echo ""; - return 1; - } - else { - echo ""; - return 0; - } - echo ""; -} - -function check_include ( $ext, $label ) { - echo ""; - echo " $label "; - echo ""; - if (!include($ext)) { - echo ""; - return 1; - } - else { - echo ""; - return 0; - } - echo ""; -} - -function check_exists ( $file, $label ) { - echo ""; - echo " $label "; - echo ""; - if (!file_exists ($file)) { - echo " "; - return 1; - } - else { - echo " "; - return 0; - } - echo ""; -} - -function check_generic ( $ok, $label ) { - echo ""; - if ($ok == 0 ) { - echo " "; - echo ""; - echo " $label "; - echo ""; - echo ""; - return 1; - } - else { - echo " "; - echo ""; - echo " $label "; - echo ""; - echo ""; - return 0; - } -} - -function check_writable ( $fullpath, $label ) { - echo ""; - if (file_exists($fullpath)) - if (is_writable($fullpath)) { - echo " "; - echo ""; - echo " $label "; - echo ""; - echo ""; - return 0; - } - else { - echo " "; - echo ""; - echo " $label "; - echo ""; - echo ""; - return 1; - } - else { - echo " "; - echo ""; - echo " $label "; - echo ""; - echo ""; - return 1; - } -} - -function check_variable ( $var, $value, $label, $mode ) { - echo ""; - echo " $label "; - echo ""; - if ($mode == 1) { - if ($var >= $value) { - echo " "; - return 0; - } - else { - echo " "; - return 1; - } - } - elseif ($var == $value) { - echo " "; - return 0; - } - else { - echo " "; - return 1; - } - echo ""; -} - -function parse_mysql_dump($url) { - if (file_exists($url)) { - $file_content = file($url); - $query = ""; - foreach($file_content as $sql_line) { - if (trim($sql_line) != "" && strpos($sql_line, "-- ") === false) { - $query .= $sql_line; - if(preg_match("/;[\040]*\$/", $sql_line)) { - if (!$result = mysql_query($query)) { - echo mysql_error(); //Uncomment for debug - echo "
$query
"; - return 0; - } - $query = ""; - } - } - } - return 1; - } - else - return 0; -} - -function parse_mysqli_dump($connection, $url) { - if (file_exists($url)) { - $file_content = file($url); - $query = ""; - foreach($file_content as $sql_line) { - if (trim($sql_line) != "" && strpos($sql_line, "-- ") === false) { - $query .= $sql_line; - if(preg_match("/;[\040]*\$/", $sql_line)) { - if (!$result = mysqli_query($connection, $query)) { - echo mysqli_error(); //Uncomment for debug - echo "
$query
"; - return 0; - } - $query = ""; - } - } - } - return 1; - } - else - return 0; -} - -function random_name ($size) { - $temp = ""; - for ($a=0;$a< $size;$a++) - $temp = $temp. chr(rand(122,97)); - - return $temp; -} - -function print_logo_status ($step, $step_total) { - global $banner; - - $header = " -
-
-
- $banner -
-
"; - $header .= " -
- Install step $step of $step_total -
"; - - return $header; -} - -// -// This function adjusts path settings in pandora db for FreeBSD. -// -// All packages and configuration files except operating system's base files -// are installed under /usr/local in FreeBSD. So, path settings in pandora db -// for some programs should be changed from the Linux default. -// -function adjust_paths_for_freebsd($engine, $connection = false) { - - $adjust_sql = array( - "update trecon_script set script = REPLACE(script,'/usr/share','/usr/local/share');", - "update tconfig set value = REPLACE(value,'/usr/bin','/usr/local/bin') where token='netflow_daemon' OR token='netflow_nfdump' OR token='netflow_nfexpire';", - "update talert_commands set command = REPLACE(command,'/usr/bin','/usr/local/bin');", - "update talert_commands set command = REPLACE(command,'/usr/share', '/usr/local/share');", - "update tplugin set execute = REPLACE(execute,'/usr/share','/usr/local/share');", - "update tevent_response set target = REPLACE(target,'/usr/share','/usr/local/share');", - "insert into tconfig (token, value) VALUES ('graphviz_bin_dir', '/usr/local/bin');" - ); - - for ($i = 0; $i < count ($adjust_sql); $i++) { - switch ($engine) { - case 'mysql': - $result = mysql_query($adjust_sql[$i]); - break; - case 'mysqli': - $result = mysqli_query($connection, $adjust_sql[$i]); - break; - case 'oracle': - //Delete the last semicolon from current query - $query = substr($adjust_sql[$i], 0, strlen($adjust_sql[$i]) - 1); - $sql = oci_parse($connection, $query); - $result = oci_execute($sql); - break; - case 'pgsql': - pg_send_query($connection, $adjust_sql[$i]); - $result = pg_get_result($connection); - break; - } - if (!$result) { - return 0; - } - } - - return 1; -} - -function install_step1() { - global $banner; - - echo " -
-
- " . print_logo_status (1,6) . " -
-

Welcome to Pandora FMS installation Wizard

-

This wizard helps you to quick install Pandora FMS console and main database in your system.

-

In four steps, this installer will check all dependencies and will create your configuration, ready to use.

-

For more information, please refer to documentation.
- Pandora FMS Development Team

- "; - if (file_exists("include/config.php")) { - echo "
Warning: You already have a config.php file. - Configuration and database would be overwritten if you continued.
"; - } - echo "
"; - echo ""; - $writable = check_writable ( "include", "Checking if ./include is writable"); - if (file_exists("include/config.php")) - $writable += check_writable ( "include/config.php", "Checking if include/config.php is writable"); - echo "
"; - - echo "
Warning: This installer will overwrite and destroy - your existing Pandora FMS configuration and Database. Before continue, - please be sure that you have no valuable Pandora FMS data in your Database.
-
"; - - echo "
Upgrade: - If you want to upgrade from Pandora FMS 4.x to 5.0 version, please use the migration tool inside /extras directory in this setup. -
"; - - echo "
"; - - if ($writable == 0) { - echo "
"; - echo ""; - echo "
"; - } - else { - echo "
ERROR:You need to setup permissions to be able to write in ./include directory
"; - } - echo "
"; - - echo "
"; - echo " -
-
- Pandora FMS is an OpenSource Software project registered at - SourceForge -
-
"; -} - -function install_step1_licence() { - echo " -
-
- " . print_logo_status (2,6) . " -
-

GPL2 Licence terms agreement

-

Pandora FMS is an OpenSource software project licensed under the GPL2 licence. Pandora FMS includes, as well, another software also licensed under LGPL and BSD licenses. Before continue, you must accept the licence terms.. -

For more information, please refer to our website at http://pandorafms.org and contact us if you have any kind of question about the usage of Pandora FMS

-

If you dont accept the licence terms, please, close your browser and delete Pandora FMS files.

- "; - - if (!file_exists("COPYING")) { - echo "
Licence file 'COPYING' is not present in your distribution. This means you have some 'partial' Pandora FMS distribution. We cannot continue without accepting the licence file."; - echo "
"; - } - else { - echo ""; - echo ""; - echo "

"; - echo "

"; - } - echo "
"; - - echo "
-
-
- Pandora FMS is an OpenSource Software project registered at - SourceForge -
-
"; -} - -function install_step2() { - - echo " -
-
- " . print_logo_status (3,6) . " -
"; - echo "

Checking software dependencies

"; - echo ""; - $res = 0; - $res += check_variable(phpversion(),"5.2","PHP version >= 5.2",1); - $res += check_extension("gd","PHP GD extension"); - $res += check_extension("ldap","PHP LDAP extension"); - $res += check_extension("snmp","PHP SNMP extension"); - $res += check_extension("session","PHP session extension"); - $res += check_extension("gettext","PHP gettext extension"); - $res += check_extension("mbstring","PHP Multibyte String"); - $res += check_extension("zip","PHP Zip"); - $res += check_extension("zlib","PHP Zlib extension"); - $res += check_extension("json","PHP json extension"); - $res += check_extension("curl","CURL (Client URL Library)"); - $res += check_extension("filter","PHP filter extension"); - $res += check_extension("calendar","PHP calendar extension"); - if (PHP_OS == "FreeBSD") { - $res += check_exists ("/usr/local/bin/twopi","Graphviz Binary"); - } - else if (PHP_OS == "NetBSD") { - $res += check_exists ("/usr/pkg/bin/twopi","Graphviz Binary"); - } - else if ( substr(PHP_OS, 0, 3) == 'WIN' ) { - $res += check_exists ("..\\..\\..\\Graphviz\\bin\\twopi.exe", "Graphviz Binary"); - } - else { - $res += check_exists ("/usr/bin/twopi","Graphviz Binary"); - } - - echo ""; - check_extension("mysql", "PHP MySQL extension"); - check_extension("mysqli", "PHP MySQL(mysqli) extension"); - echo "
"; - echo "DB Engines"; - echo ""; - echo "
"; - - if ($res > 0) { - echo " -
You have some incomplete - dependencies. Please correct them or this installer - will not be able to finish your installation. -
-
- Remember, if you install any PHP module to comply - with these dependences, you need to restart - your HTTP/Apache server after it to use the new - modules. -
-
- Ignore it. -
"; - } - else { - echo "
"; - echo " - "; - echo "
"; - } - echo "
"; - echo "
"; - echo " -
-
-
-
- Pandora FMS is an OpenSource Software project registered at - SourceForge -
-
"; -} - - -function install_step3() { - $options = ''; - if (extension_loaded("mysql")) { - $options .= ""; - } - if (extension_loaded("mysqli")) { - $options .= ""; - } - - $error = false; - if (empty($options)) { - $error = true; - } - - echo " -
-
- " . print_logo_status (4,6) . " -
-

Environment and database setup

-

- This wizard will create your Pandora FMS database, - and populate it with all the data needed to run for the first time. -

-

- You need a privileged user to create database schema, this is usually root user. - Information about root user will not be used or stored anymore. -

-

- You can also deploy the scheme into an existing Database. - In this case you need a privileged Database user and password of that instance. -

-

- Now, please, complete all details to configure your database and environment setup. -

-
- Warning: This installer will overwrite and destroy your existing - Pandora FMS configuration and Database. Before continue, - please be sure that you have no valuable Pandora FMS data in your Database. -

-
"; - - if (extension_loaded("oci8")) { - echo "
For Oracle installation an existing Database with a privileged user is needed.
"; - } - if (!$error) { - echo ""; - } - - echo ""; - echo ""; - - // the field dbgrant is only shown when the DB host is different from 127.0.0.1 or localhost - echo " - - "; - - - echo " "; - - echo ""; - if ($_SERVER['SERVER_ADDR'] == 'localhost' || $_SERVER['SERVER_ADDR'] == '127.0.0.1') { - echo "
"; - echo "DB Engine
"; - - - if ($error) { - echo " -
- Warning: You haven't a any DB engine with PHP. Please check the previous step to DB engine dependencies. -
"; - } - else { - echo ""; - - echo "		"; - echo " Installation in
"; - echo ""; - } - echo "
DB User with privileges
- - - 		DB Password for this user
- - -
DB Hostname
- - - 		DB Name (pandora by default)
- - -
Drop Database if exists
- - 		Full path to HTTP publication directory
- For example /var/www/pandora_console/ -
- - -
- Drop Database if exists
- - "; - } else { - echo "		"; - } - echo "URL path to Pandora FMS Console
- For example '/pandora_console' -
- -
- "; - - if (!$error) { - echo "
"; - echo " - "; - echo "
"; - } - - echo "
"; - - echo ""; - - echo "
"; - echo "
-
- Pandora FMS is an OpenSource Software project registered at - SourceForge -
-
"; -} - -function install_step4() { - $pandora_config = "include/config.php"; - - if ( (! isset($_POST["user"])) || (! isset($_POST["dbname"])) || (! isset($_POST["host"])) || - (! isset($_POST["pass"])) || (!isset($_POST['engine'])) || (! isset($_POST["db_action"])) ) { - $dbpassword = ""; - $dbuser = ""; - $dbhost = ""; - $dbname = ""; - $engine = ""; - $dbaction = ""; - $dbgrant = ""; - } - else { - $engine = $_POST['engine']; - $dbpassword = $_POST["pass"]; - $dbuser = $_POST["user"]; - $dbhost = $_POST["host"]; - $dbaction = $_POST["db_action"]; - if (isset($_POST["dbgrant"]) && $_POST["dbgrant"] != "") - $dbgrant = $_POST["dbgrant"]; - else - $dbgrant = $_SERVER["SERVER_ADDR"]; - if (isset($_POST["drop"])) - $dbdrop = $_POST["drop"]; - else - $dbdrop = 0; - - $dbname = $_POST["dbname"]; - if (isset($_POST["url"])) - $url = $_POST["url"]; - else - $url = "http://localhost"; - if (isset($_POST["path"])) { - $path = $_POST["path"]; - $path = str_replace("\\", "/", $path); // Windows compatibility - } - else - $path = "/var/www"; - } - $everything_ok = 0; - $step1=0; - $step2=0; - $step3=0; - $step4=0; $step5=0; $step6=0; $step7=0; - - echo " -
-
- " . print_logo_status(5,6) . " -
-

Creating database and default configuration file

- "; - switch ($engine) { - case 'mysql': - if (! mysql_connect ($dbhost, $dbuser, $dbpassword)) { - check_generic ( 0, "Connection with Database"); - } - else { - check_generic ( 1, "Connection with Database"); - - // Drop database if needed and don't want to install over an existing DB - if ($dbdrop == 1) { - mysql_query ("DROP DATABASE IF EXISTS `$dbname`"); - } - - // Create schema - if ($dbaction == 'db_new' || $dbdrop == 1) { - $step1 = mysql_query ("CREATE DATABASE `$dbname`"); - check_generic ($step1, "Creating database '$dbname'"); - } - else { - $step1 = 1; - } - if ($step1 == 1) { - $step2 = mysql_select_db($dbname); - check_generic ($step2, "Opening database '$dbname'"); - - $step3 = parse_mysql_dump("pandoradb.sql"); - check_generic ($step3, "Creating schema"); - - $step4 = parse_mysql_dump("pandoradb_data.sql"); - check_generic ($step4, "Populating database"); - if (PHP_OS == "FreeBSD") { - $step_freebsd = adjust_paths_for_freebsd ($engine); - check_generic ($step_freebsd, "Adjusting paths in database for FreeBSD"); - } - - $random_password = random_name (8); - $host = $dbhost; // set default granted origin to the origin of the queries - if (($dbhost != 'localhost') && ($dbhost != '127.0.0.1')) - $host = $dbgrant; // if the granted origin is different from local machine, set the valid origin - $step5 = mysql_query ("GRANT ALL PRIVILEGES ON `$dbname`.* to pandora@$host - IDENTIFIED BY '".$random_password."'"); - mysql_query ("FLUSH PRIVILEGES"); - check_generic ($step5, "Established privileges for user pandora. A new random password has been generated: $random_password
Please write it down, you will need to setup your Pandora FMS server, editing the /etc/pandora/pandora_server.conf file
"); - - $step6 = is_writable("include"); - check_generic ($step6, "Write permissions to save config file in './include'"); - - $cfgin = fopen ("include/config.inc.php","r"); - $cfgout = fopen ($pandora_config,"w"); - $config_contents = fread ($cfgin, filesize("include/config.inc.php")); - $dbtype = 'mysql'; - $config_new = ''; - $step7 = fputs ($cfgout, $config_new); - $step7 = $step7 + fputs ($cfgout, $config_contents); - if ($step7 > 0) - $step7 = 1; - fclose ($cfgin); - fclose ($cfgout); - chmod ($pandora_config, 0600); - check_generic ($step7, "Created new config file at '".$pandora_config."'"); - } - } - - if (($step7 + $step6 + $step5 + $step4 + $step3 + $step2 + $step1) == 7) { - $everything_ok = 1; - } - break; - case 'mysqli': - $connection = mysqli_connect ($dbhost, $dbuser, $dbpassword); - if (mysqli_connect_error() > 0) { - check_generic ( 0, "Connection with Database"); - } - else { - check_generic ( 1, "Connection with Database"); - - // Drop database if needed and don't want to install over an existing DB - if ($dbdrop == 1) { - mysqli_query ($connection, "DROP DATABASE IF EXISTS `$dbname`"); - } - - // Create schema - if ($dbaction == 'db_new' || $dbdrop == 1) { - $step1 = mysqli_query ($connection, "CREATE DATABASE `$dbname`"); - check_generic ($step1, "Creating database '$dbname'"); - } - else { - $step1 = 1; - } - if ($step1 == 1) { - $step2 = mysqli_select_db($connection, $dbname); - check_generic ($step2, "Opening database '$dbname'"); - - $step3 = parse_mysqli_dump($connection, "pandoradb.sql"); - check_generic ($step3, "Creating schema"); - - $step4 = parse_mysqli_dump($connection, "pandoradb_data.sql"); - check_generic ($step4, "Populating database"); - if (PHP_OS == "FreeBSD") { - $step_freebsd = adjust_paths_for_freebsd ($engine, $connection); - check_generic ($step_freebsd, "Adjusting paths in database for FreeBSD"); - } - - $random_password = random_name (8); - $host = $dbhost; // set default granted origin to the origin of the queries - if (($dbhost != 'localhost') && ($dbhost != '127.0.0.1')) - $host = $dbgrant; // if the granted origin is different from local machine, set the valid origin - $step5 = mysqli_query ($connection, "GRANT ALL PRIVILEGES ON `$dbname`.* to pandora@$host - IDENTIFIED BY '".$random_password."'"); - mysqli_query ($connection, "FLUSH PRIVILEGES"); - check_generic ($step5, "Established privileges for user pandora. A new random password has been generated: $random_password
Please write it down, you will need to setup your Pandora FMS server, editing the /etc/pandora/pandora_server.conf file
"); - - $step6 = is_writable("include"); - check_generic ($step6, "Write permissions to save config file in './include'"); - - $cfgin = fopen ("include/config.inc.php","r"); - $cfgout = fopen ($pandora_config,"w"); - $config_contents = fread ($cfgin, filesize("include/config.inc.php")); - $dbtype = 'mysql'; - $config_new = ''; - $step7 = fputs ($cfgout, $config_new); - $step7 = $step7 + fputs ($cfgout, $config_contents); - if ($step7 > 0) - $step7 = 1; - fclose ($cfgin); - fclose ($cfgout); - chmod ($pandora_config, 0600); - check_generic ($step7, "Created new config file at '".$pandora_config."'"); - } - } - - if (($step7 + $step6 + $step5 + $step4 + $step3 + $step2 + $step1) == 7) { - $everything_ok = 1; - } - break; - } - echo "
"; - - if ($everything_ok == 1) { - echo "
"; - echo " - "; - echo "
"; - } - else { - $info = "
There were some problems. - Installation was not completed. -

Please correct failures before trying again. - All database "; - if ($engine == 'oracle') - $info .= "objects "; - else - $info .= "schemes "; - - $info .= "created in this step have been dropped.

-
"; - echo $info; - - switch ($engine) { - case 'mysql': - if (mysql_error() != "") { - echo "
ERROR: ". mysql_error().".
"; - } - - if ($step1 == 1) { - mysql_query ("DROP DATABASE $dbname"); - } - break; - case 'mysqli': - if (mysqli_error($connection) != "") { - echo "
ERROR: ". mysqli_error($connection).".
"; - } - - if ($step1 == 1) { - mysqli_query ($connection, "DROP DATABASE $dbname"); - } - break; - } - echo "
"; - } - echo "
"; - echo "
"; - echo " -
-
- Pandora FMS is an Open Source Software project registered at - SourceForge -
- "; -} - - -function install_step5() { - echo " -
-
- " . print_logo_status (6,6) . " -
-

Installation complete

-

For security, you now must manually delete this installer - ('install.php') file before trying to access to your Pandora FMS console. -

You should also install Pandora FMS Servers before trying to monitor anything; - please read documentation on how to install it.

-

Default user is 'admin' with password 'pandora', - please change it both as soon as possible.

-

Don't forget to check http://pandorafms.com - for updates. -

Select if you want to rename 'install.php'.

-
- - -
-


. -

-
"; - - echo "
-
- Pandora FMS is an OpenSource Software project registered at - SourceForge -
-
"; -} -?> diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new index 1ffe5739f0..3e5a2e4d67 100644 --- a/pandora_server/conf/pandora_server.conf.new +++ b/pandora_server/conf/pandora_server.conf.new @@ -560,3 +560,12 @@ enc_dir /usr/share/pandora_server/enc/ # Go to http://wiki.pandorafms.com/ for more information. dynamic_updates 5 +# Enable (1) or disable (0) the Pandora FMS WUX Server (PANDORA FMS ENTERPRISE ONLY). +wuxserver 0 + +# Host of the Selenium Grid Server. +#wux_host localhost + +# Port of the Selenium Grid Server. +#wux_port 4444 + diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index d896f50d90..9bffd01f3c 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -445,6 +445,11 @@ sub pandora_load_config { $pa_config->{"warmup_unknown_interval"} = 300; # 6.1 $pa_config->{"warmup_unknown_on"} = 1; # 6.1 + $pa_config->{"wuxserver"} = 1; # 7.0 + $pa_config->{"wux_host"} = undef; # 7.0 + $pa_config->{"wux_port"} = 4444; # 7.0 + $pa_config->{"wux_browser"} = "*firefox"; # 7.0 + #$pa_config->{'include_agents'} = 0; #6.1 # # External .enc files for XML::Parser. @@ -1030,6 +1035,18 @@ sub pandora_load_config { elsif ($parametro =~ m/^dynamic_constant\s+([0-9]*)/i) { $pa_config->{'dynamic_constant'}= clean_blank($1); } + elsif ($parametro =~ m/^wuxserver\s+([0-1]*)/i) { + $pa_config->{"wuxserver"} = clean_blank($1); + } + elsif ($parametro =~ m/^wux_host\s+(.*)/i) { + $pa_config->{'wux_host'}= clean_blank($1); + } + elsif ($parametro =~ m/^wux_port\s+([0-9]*)/i) { + $pa_config->{'wux_port'}= clean_blank($1); + } + elsif ($parametro =~ m/^wux_browser\s+(.*)/i) { + $pa_config->{'wux_browser'}= clean_blank($1); + } } # end of loop for parameter # # Set to RDBMS' standard port diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 7acb66ecd8..b6d3a0fed4 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -243,7 +243,7 @@ our @EXPORT = qw( # Some global variables our @DayNames = qw(sunday monday tuesday wednesday thursday friday saturday); -our @ServerTypes = qw (dataserver networkserver snmpconsole reconserver pluginserver predictionserver wmiserver exportserver inventoryserver webserver eventserver icmpserver snmpserver satelliteserver transactionalserver mfserver syncserver); +our @ServerTypes = qw (dataserver networkserver snmpconsole reconserver pluginserver predictionserver wmiserver exportserver inventoryserver webserver eventserver icmpserver snmpserver satelliteserver transactionalserver mfserver syncserver wuxserver); our @AlertStatus = ('Execute the alert', 'Do not execute the alert', 'Do not execute the alert, but increment its internal counter', 'Cease the alert', 'Recover the alert', 'Reset internal counter'); # Event storm protection (no alerts or events) diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm index aecfb1b59f..b2fe95bdb1 100755 --- a/pandora_server/lib/PandoraFMS/Tools.pm +++ b/pandora_server/lib/PandoraFMS/Tools.pm @@ -61,6 +61,7 @@ our @EXPORT = qw( TRANSACTIONALSERVER SYNCSERVER METACONSOLE_LICENSE + WUXSERVER $DEVNULL $OS $OS_VERSION @@ -122,6 +123,7 @@ use constant SATELLITESERVER => 13; use constant TRANSACTIONALSERVER => 14; use constant MFSERVER => 15; use constant SYNCSERVER => 16; +use constant WUXSERVER => 17; # Value for a metaconsole license type use constant METACONSOLE_LICENSE => 0x01; From f6c3922bba23b290b71ff742eb13807563ad3fd6 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Fri, 11 Aug 2017 11:10:35 +0200 Subject: [PATCH 05/50] Add perl-Test-WWW-Selenium to the testing Docker image. --- tests/enterprise_base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/enterprise_base/Dockerfile b/tests/enterprise_base/Dockerfile index c4bd6406e0..c99b835c19 100644 --- a/tests/enterprise_base/Dockerfile +++ b/tests/enterprise_base/Dockerfile @@ -2,7 +2,7 @@ FROM pandorafms/pandorafms-base MAINTAINER Pandora FMS Team # Pandora FMS Server dependencies -RUN yum install -y fping +RUN yum install -y fping perl-Test-WWW-Selenium RUN ln -s /usr/bin/braa /usr/local/bin/braa From 7c0f0e3b31bbfcc727aa85a99af8ff0aad6397e5 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Fri, 11 Aug 2017 11:22:03 +0200 Subject: [PATCH 06/50] Restored install.php. --- pandora_console/install.php | 983 ++++++++++++++++++++++++++++++++++++ 1 file changed, 983 insertions(+) create mode 100644 pandora_console/install.php diff --git a/pandora_console/install.php b/pandora_console/install.php new file mode 100644 index 0000000000..b9549887a7 --- /dev/null +++ b/pandora_console/install.php @@ -0,0 +1,983 @@ + + + + + Pandora FMS - Installation Wizard + + + + + + + + + + + + + +
+ +
+ + + +"; + echo " $label "; + echo ""; + if (!extension_loaded($ext)) { + echo ""; + return 1; + } + else { + echo ""; + return 0; + } + echo ""; +} + +function check_include ( $ext, $label ) { + echo ""; + echo " $label "; + echo ""; + if (!include($ext)) { + echo ""; + return 1; + } + else { + echo ""; + return 0; + } + echo ""; +} + +function check_exists ( $file, $label ) { + echo ""; + echo " $label "; + echo ""; + if (!file_exists ($file)) { + echo " "; + return 1; + } + else { + echo " "; + return 0; + } + echo ""; +} + +function check_generic ( $ok, $label ) { + echo ""; + if ($ok == 0 ) { + echo " "; + echo ""; + echo " $label "; + echo ""; + echo ""; + return 1; + } + else { + echo " "; + echo ""; + echo " $label "; + echo ""; + echo ""; + return 0; + } +} + +function check_writable ( $fullpath, $label ) { + echo ""; + if (file_exists($fullpath)) + if (is_writable($fullpath)) { + echo " "; + echo ""; + echo " $label "; + echo ""; + echo ""; + return 0; + } + else { + echo " "; + echo ""; + echo " $label "; + echo ""; + echo ""; + return 1; + } + else { + echo " "; + echo ""; + echo " $label "; + echo ""; + echo ""; + return 1; + } +} + +function check_variable ( $var, $value, $label, $mode ) { + echo ""; + echo " $label "; + echo ""; + if ($mode == 1) { + if ($var >= $value) { + echo " "; + return 0; + } + else { + echo " "; + return 1; + } + } + elseif ($var == $value) { + echo " "; + return 0; + } + else { + echo " "; + return 1; + } + echo ""; +} + +function parse_mysql_dump($url) { + if (file_exists($url)) { + $file_content = file($url); + $query = ""; + foreach($file_content as $sql_line) { + if (trim($sql_line) != "" && strpos($sql_line, "-- ") === false) { + $query .= $sql_line; + if(preg_match("/;[\040]*\$/", $sql_line)) { + if (!$result = mysql_query($query)) { + echo mysql_error(); //Uncomment for debug + echo "
$query
"; + return 0; + } + $query = ""; + } + } + } + return 1; + } + else + return 0; +} + +function parse_mysqli_dump($connection, $url) { + if (file_exists($url)) { + $file_content = file($url); + $query = ""; + foreach($file_content as $sql_line) { + if (trim($sql_line) != "" && strpos($sql_line, "-- ") === false) { + $query .= $sql_line; + if(preg_match("/;[\040]*\$/", $sql_line)) { + if (!$result = mysqli_query($connection, $query)) { + echo mysqli_error(); //Uncomment for debug + echo "
$query
"; + return 0; + } + $query = ""; + } + } + } + return 1; + } + else + return 0; +} + +function random_name ($size) { + $temp = ""; + for ($a=0;$a< $size;$a++) + $temp = $temp. chr(rand(122,97)); + + return $temp; +} + +function print_logo_status ($step, $step_total) { + global $banner; + + $header = " +
+
+
+ $banner +
+
"; + $header .= " +
+ Install step $step of $step_total +
"; + + return $header; +} + +// +// This function adjusts path settings in pandora db for FreeBSD. +// +// All packages and configuration files except operating system's base files +// are installed under /usr/local in FreeBSD. So, path settings in pandora db +// for some programs should be changed from the Linux default. +// +function adjust_paths_for_freebsd($engine, $connection = false) { + + $adjust_sql = array( + "update trecon_script set script = REPLACE(script,'/usr/share','/usr/local/share');", + "update tconfig set value = REPLACE(value,'/usr/bin','/usr/local/bin') where token='netflow_daemon' OR token='netflow_nfdump' OR token='netflow_nfexpire';", + "update talert_commands set command = REPLACE(command,'/usr/bin','/usr/local/bin');", + "update talert_commands set command = REPLACE(command,'/usr/share', '/usr/local/share');", + "update tplugin set execute = REPLACE(execute,'/usr/share','/usr/local/share');", + "update tevent_response set target = REPLACE(target,'/usr/share','/usr/local/share');", + "insert into tconfig (token, value) VALUES ('graphviz_bin_dir', '/usr/local/bin');" + ); + + for ($i = 0; $i < count ($adjust_sql); $i++) { + switch ($engine) { + case 'mysql': + $result = mysql_query($adjust_sql[$i]); + break; + case 'mysqli': + $result = mysqli_query($connection, $adjust_sql[$i]); + break; + case 'oracle': + //Delete the last semicolon from current query + $query = substr($adjust_sql[$i], 0, strlen($adjust_sql[$i]) - 1); + $sql = oci_parse($connection, $query); + $result = oci_execute($sql); + break; + case 'pgsql': + pg_send_query($connection, $adjust_sql[$i]); + $result = pg_get_result($connection); + break; + } + if (!$result) { + return 0; + } + } + + return 1; +} + +function install_step1() { + global $banner; + + echo " +
+
+ " . print_logo_status (1,6) . " +
+

Welcome to Pandora FMS installation Wizard

+

This wizard helps you to quick install Pandora FMS console and main database in your system.

+

In four steps, this installer will check all dependencies and will create your configuration, ready to use.

+

For more information, please refer to documentation.
+ Pandora FMS Development Team

+ "; + if (file_exists("include/config.php")) { + echo "
Warning: You already have a config.php file. + Configuration and database would be overwritten if you continued.
"; + } + echo "
"; + echo ""; + $writable = check_writable ( "include", "Checking if ./include is writable"); + if (file_exists("include/config.php")) + $writable += check_writable ( "include/config.php", "Checking if include/config.php is writable"); + echo "
"; + + echo "
Warning: This installer will overwrite and destroy + your existing Pandora FMS configuration and Database. Before continue, + please be sure that you have no valuable Pandora FMS data in your Database.
+
"; + + echo "
Upgrade: + If you want to upgrade from Pandora FMS 4.x to 5.0 version, please use the migration tool inside /extras directory in this setup. +
"; + + echo "
"; + + if ($writable == 0) { + echo "
"; + echo ""; + echo "
"; + } + else { + echo "
ERROR:You need to setup permissions to be able to write in ./include directory
"; + } + echo "
"; + + echo "
"; + echo " +
+
+ Pandora FMS is an OpenSource Software project registered at + SourceForge +
+
"; +} + +function install_step1_licence() { + echo " +
+
+ " . print_logo_status (2,6) . " +
+

GPL2 Licence terms agreement

+

Pandora FMS is an OpenSource software project licensed under the GPL2 licence. Pandora FMS includes, as well, another software also licensed under LGPL and BSD licenses. Before continue, you must accept the licence terms.. +

For more information, please refer to our website at http://pandorafms.org and contact us if you have any kind of question about the usage of Pandora FMS

+

If you dont accept the licence terms, please, close your browser and delete Pandora FMS files.

+ "; + + if (!file_exists("COPYING")) { + echo "
Licence file 'COPYING' is not present in your distribution. This means you have some 'partial' Pandora FMS distribution. We cannot continue without accepting the licence file."; + echo "
"; + } + else { + echo "
"; + echo ""; + echo "

"; + echo "

"; + } + echo "
"; + + echo "
+
+
+ Pandora FMS is an OpenSource Software project registered at + SourceForge +
+
"; +} + +function install_step2() { + + echo " +
+
+ " . print_logo_status (3,6) . " +
"; + echo "

Checking software dependencies

"; + echo ""; + $res = 0; + $res += check_variable(phpversion(),"5.2","PHP version >= 5.2",1); + $res += check_extension("gd","PHP GD extension"); + $res += check_extension("ldap","PHP LDAP extension"); + $res += check_extension("snmp","PHP SNMP extension"); + $res += check_extension("session","PHP session extension"); + $res += check_extension("gettext","PHP gettext extension"); + $res += check_extension("mbstring","PHP Multibyte String"); + $res += check_extension("zip","PHP Zip"); + $res += check_extension("zlib","PHP Zlib extension"); + $res += check_extension("json","PHP json extension"); + $res += check_extension("curl","CURL (Client URL Library)"); + $res += check_extension("filter","PHP filter extension"); + $res += check_extension("calendar","PHP calendar extension"); + if (PHP_OS == "FreeBSD") { + $res += check_exists ("/usr/local/bin/twopi","Graphviz Binary"); + } + else if (PHP_OS == "NetBSD") { + $res += check_exists ("/usr/pkg/bin/twopi","Graphviz Binary"); + } + else if ( substr(PHP_OS, 0, 3) == 'WIN' ) { + $res += check_exists ("..\\..\\..\\Graphviz\\bin\\twopi.exe", "Graphviz Binary"); + } + else { + $res += check_exists ("/usr/bin/twopi","Graphviz Binary"); + } + + echo ""; + check_extension("mysql", "PHP MySQL extension"); + check_extension("mysqli", "PHP MySQL(mysqli) extension"); + echo "
"; + echo "DB Engines"; + echo ""; + echo "
"; + + if ($res > 0) { + echo " +
You have some incomplete + dependencies. Please correct them or this installer + will not be able to finish your installation. +
+
+ Remember, if you install any PHP module to comply + with these dependences, you need to restart + your HTTP/Apache server after it to use the new + modules. +
+
+ Ignore it. +
"; + } + else { + echo "
"; + echo " + "; + echo "
"; + } + echo "
"; + echo "
"; + echo " +
+
+
+
+ Pandora FMS is an OpenSource Software project registered at + SourceForge +
+ "; +} + + +function install_step3() { + $options = ''; + if (extension_loaded("mysql")) { + $options .= ""; + } + if (extension_loaded("mysqli")) { + $options .= ""; + } + + $error = false; + if (empty($options)) { + $error = true; + } + + echo " +
+
+ " . print_logo_status (4,6) . " +
+

Environment and database setup

+

+ This wizard will create your Pandora FMS database, + and populate it with all the data needed to run for the first time. +

+

+ You need a privileged user to create database schema, this is usually root user. + Information about root user will not be used or stored anymore. +

+

+ You can also deploy the scheme into an existing Database. + In this case you need a privileged Database user and password of that instance. +

+

+ Now, please, complete all details to configure your database and environment setup. +

+
+ Warning: This installer will overwrite and destroy your existing + Pandora FMS configuration and Database. Before continue, + please be sure that you have no valuable Pandora FMS data in your Database. +

+
"; + + if (extension_loaded("oci8")) { + echo "
For Oracle installation an existing Database with a privileged user is needed.
"; + } + if (!$error) { + echo ""; + } + + echo ""; + echo ""; + + // the field dbgrant is only shown when the DB host is different from 127.0.0.1 or localhost + echo " + + "; + + + echo " "; + + echo ""; + if ($_SERVER['SERVER_ADDR'] == 'localhost' || $_SERVER['SERVER_ADDR'] == '127.0.0.1') { + echo "
"; + echo "DB Engine
"; + + + if ($error) { + echo " +
+ Warning: You haven't a any DB engine with PHP. Please check the previous step to DB engine dependencies. +
"; + } + else { + echo ""; + + echo "		"; + echo " Installation in
"; + echo ""; + } + echo "
DB User with privileges
+ + + 		DB Password for this user
+ + +
DB Hostname
+ + + 		DB Name (pandora by default)
+ + +
Drop Database if exists
+ + 		Full path to HTTP publication directory
+ For example /var/www/pandora_console/ +
+ + +
+ Drop Database if exists
+ + "; + } else { + echo "		"; + } + echo "URL path to Pandora FMS Console
+ For example '/pandora_console' +
+ +
+ "; + + if (!$error) { + echo "
"; + echo " + "; + echo "
"; + } + + echo "
"; + + echo ""; + + echo "
"; + echo "
+
+ Pandora FMS is an OpenSource Software project registered at + SourceForge +
+
"; +} + +function install_step4() { + $pandora_config = "include/config.php"; + + if ( (! isset($_POST["user"])) || (! isset($_POST["dbname"])) || (! isset($_POST["host"])) || + (! isset($_POST["pass"])) || (!isset($_POST['engine'])) || (! isset($_POST["db_action"])) ) { + $dbpassword = ""; + $dbuser = ""; + $dbhost = ""; + $dbname = ""; + $engine = ""; + $dbaction = ""; + $dbgrant = ""; + } + else { + $engine = $_POST['engine']; + $dbpassword = $_POST["pass"]; + $dbuser = $_POST["user"]; + $dbhost = $_POST["host"]; + $dbaction = $_POST["db_action"]; + if (isset($_POST["dbgrant"]) && $_POST["dbgrant"] != "") + $dbgrant = $_POST["dbgrant"]; + else + $dbgrant = $_SERVER["SERVER_ADDR"]; + if (isset($_POST["drop"])) + $dbdrop = $_POST["drop"]; + else + $dbdrop = 0; + + $dbname = $_POST["dbname"]; + if (isset($_POST["url"])) + $url = $_POST["url"]; + else + $url = "http://localhost"; + if (isset($_POST["path"])) { + $path = $_POST["path"]; + $path = str_replace("\\", "/", $path); // Windows compatibility + } + else + $path = "/var/www"; + } + $everything_ok = 0; + $step1=0; + $step2=0; + $step3=0; + $step4=0; $step5=0; $step6=0; $step7=0; + + echo " +
+
+ " . print_logo_status(5,6) . " +
+

Creating database and default configuration file

+ "; + switch ($engine) { + case 'mysql': + if (! mysql_connect ($dbhost, $dbuser, $dbpassword)) { + check_generic ( 0, "Connection with Database"); + } + else { + check_generic ( 1, "Connection with Database"); + + // Drop database if needed and don't want to install over an existing DB + if ($dbdrop == 1) { + mysql_query ("DROP DATABASE IF EXISTS `$dbname`"); + } + + // Create schema + if ($dbaction == 'db_new' || $dbdrop == 1) { + $step1 = mysql_query ("CREATE DATABASE `$dbname`"); + check_generic ($step1, "Creating database '$dbname'"); + } + else { + $step1 = 1; + } + if ($step1 == 1) { + $step2 = mysql_select_db($dbname); + check_generic ($step2, "Opening database '$dbname'"); + + $step3 = parse_mysql_dump("pandoradb.sql"); + check_generic ($step3, "Creating schema"); + + $step4 = parse_mysql_dump("pandoradb_data.sql"); + check_generic ($step4, "Populating database"); + if (PHP_OS == "FreeBSD") { + $step_freebsd = adjust_paths_for_freebsd ($engine); + check_generic ($step_freebsd, "Adjusting paths in database for FreeBSD"); + } + + $random_password = random_name (8); + $host = $dbhost; // set default granted origin to the origin of the queries + if (($dbhost != 'localhost') && ($dbhost != '127.0.0.1')) + $host = $dbgrant; // if the granted origin is different from local machine, set the valid origin + $step5 = mysql_query ("GRANT ALL PRIVILEGES ON `$dbname`.* to pandora@$host + IDENTIFIED BY '".$random_password."'"); + mysql_query ("FLUSH PRIVILEGES"); + check_generic ($step5, "Established privileges for user pandora. A new random password has been generated: $random_password
Please write it down, you will need to setup your Pandora FMS server, editing the /etc/pandora/pandora_server.conf file
"); + + $step6 = is_writable("include"); + check_generic ($step6, "Write permissions to save config file in './include'"); + + $cfgin = fopen ("include/config.inc.php","r"); + $cfgout = fopen ($pandora_config,"w"); + $config_contents = fread ($cfgin, filesize("include/config.inc.php")); + $dbtype = 'mysql'; + $config_new = ''; + $step7 = fputs ($cfgout, $config_new); + $step7 = $step7 + fputs ($cfgout, $config_contents); + if ($step7 > 0) + $step7 = 1; + fclose ($cfgin); + fclose ($cfgout); + chmod ($pandora_config, 0600); + check_generic ($step7, "Created new config file at '".$pandora_config."'"); + } + } + + if (($step7 + $step6 + $step5 + $step4 + $step3 + $step2 + $step1) == 7) { + $everything_ok = 1; + } + break; + case 'mysqli': + $connection = mysqli_connect ($dbhost, $dbuser, $dbpassword); + if (mysqli_connect_error() > 0) { + check_generic ( 0, "Connection with Database"); + } + else { + check_generic ( 1, "Connection with Database"); + + // Drop database if needed and don't want to install over an existing DB + if ($dbdrop == 1) { + mysqli_query ($connection, "DROP DATABASE IF EXISTS `$dbname`"); + } + + // Create schema + if ($dbaction == 'db_new' || $dbdrop == 1) { + $step1 = mysqli_query ($connection, "CREATE DATABASE `$dbname`"); + check_generic ($step1, "Creating database '$dbname'"); + } + else { + $step1 = 1; + } + if ($step1 == 1) { + $step2 = mysqli_select_db($connection, $dbname); + check_generic ($step2, "Opening database '$dbname'"); + + $step3 = parse_mysqli_dump($connection, "pandoradb.sql"); + check_generic ($step3, "Creating schema"); + + $step4 = parse_mysqli_dump($connection, "pandoradb_data.sql"); + check_generic ($step4, "Populating database"); + if (PHP_OS == "FreeBSD") { + $step_freebsd = adjust_paths_for_freebsd ($engine, $connection); + check_generic ($step_freebsd, "Adjusting paths in database for FreeBSD"); + } + + $random_password = random_name (8); + $host = $dbhost; // set default granted origin to the origin of the queries + if (($dbhost != 'localhost') && ($dbhost != '127.0.0.1')) + $host = $dbgrant; // if the granted origin is different from local machine, set the valid origin + $step5 = mysqli_query ($connection, "GRANT ALL PRIVILEGES ON `$dbname`.* to pandora@$host + IDENTIFIED BY '".$random_password."'"); + mysqli_query ($connection, "FLUSH PRIVILEGES"); + check_generic ($step5, "Established privileges for user pandora. A new random password has been generated: $random_password
Please write it down, you will need to setup your Pandora FMS server, editing the /etc/pandora/pandora_server.conf file
"); + + $step6 = is_writable("include"); + check_generic ($step6, "Write permissions to save config file in './include'"); + + $cfgin = fopen ("include/config.inc.php","r"); + $cfgout = fopen ($pandora_config,"w"); + $config_contents = fread ($cfgin, filesize("include/config.inc.php")); + $dbtype = 'mysql'; + $config_new = ''; + $step7 = fputs ($cfgout, $config_new); + $step7 = $step7 + fputs ($cfgout, $config_contents); + if ($step7 > 0) + $step7 = 1; + fclose ($cfgin); + fclose ($cfgout); + chmod ($pandora_config, 0600); + check_generic ($step7, "Created new config file at '".$pandora_config."'"); + } + } + + if (($step7 + $step6 + $step5 + $step4 + $step3 + $step2 + $step1) == 7) { + $everything_ok = 1; + } + break; + } + echo "
"; + + if ($everything_ok == 1) { + echo "
"; + echo " + "; + echo "
"; + } + else { + $info = "
There were some problems. + Installation was not completed. +

Please correct failures before trying again. + All database "; + if ($engine == 'oracle') + $info .= "objects "; + else + $info .= "schemes "; + + $info .= "created in this step have been dropped.

+
"; + echo $info; + + switch ($engine) { + case 'mysql': + if (mysql_error() != "") { + echo "
ERROR: ". mysql_error().".
"; + } + + if ($step1 == 1) { + mysql_query ("DROP DATABASE $dbname"); + } + break; + case 'mysqli': + if (mysqli_error($connection) != "") { + echo "
ERROR: ". mysqli_error($connection).".
"; + } + + if ($step1 == 1) { + mysqli_query ($connection, "DROP DATABASE $dbname"); + } + break; + } + echo "
"; + } + echo "
"; + echo "
"; + echo " +
+
+ Pandora FMS is an Open Source Software project registered at + SourceForge +
+ "; +} + + +function install_step5() { + echo " +
+
+ " . print_logo_status (6,6) . " +
+

Installation complete

+

For security, you now must manually delete this installer + ('install.php') file before trying to access to your Pandora FMS console. +

You should also install Pandora FMS Servers before trying to monitor anything; + please read documentation on how to install it.

+

Default user is 'admin' with password 'pandora', + please change it both as soon as possible.

+

Don't forget to check http://pandorafms.com + for updates. +

Select if you want to rename 'install.php'.

+
+ + +
+


. +

+
"; + + echo "
+
+ Pandora FMS is an OpenSource Software project registered at + SourceForge +
+
"; +} +?> From 09bb7d8cd824ef1421d67c20cf9d510e8e0cc7ad Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Mon, 10 Jul 2017 12:46:02 +0200 Subject: [PATCH 07/50] Changed field in sql request --- pandora_console/include/functions_modules.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php index 29b5a10676..f10f7d1a42 100755 --- a/pandora_console/include/functions_modules.php +++ b/pandora_console/include/functions_modules.php @@ -1722,7 +1722,7 @@ function modules_get_agentmodule_data ($id_agent_module, $period, break; //log4x case 24: - $sql = sprintf ("SELECT message AS data, utimestamp + $sql = sprintf ("SELECT stacktrace AS data, utimestamp FROM tagente_datos_log4x WHERE id_agente_modulo = %d AND utimestamp > %d AND utimestamp <= %d From bf77ea14d1743bab8dd3f568095cff0ee166358b Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Tue, 18 Jul 2017 11:48:59 +0200 Subject: [PATCH 08/50] Added recover delimiter --- pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 1 + 1 file changed, 1 insertion(+) 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 5c004155ac..8e716a14d0 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 @@ -1327,6 +1327,7 @@ IF @vv1>0 THEN END IF; END; // +delimiter; CALL addcol(); DROP PROCEDURE addcol; From 860a81aee86a731c4eb5902d3824875d0e5aa63c Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Wed, 19 Jul 2017 10:52:01 +0200 Subject: [PATCH 09/50] Fixed urlencode in event popup --- pandora_console/include/functions_events.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 01610e5338..fe34c2ebdb 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -2115,7 +2115,7 @@ function events_page_details ($event, $server = "") { "type" => $graph_type, "period" => SECONDS_1DAY, "id" => $module["id_agente_modulo"], - "label" => rawurlencode(urlencode(base64_encode($module["nombre"]))), + "label" => base64_encode($module["nombre"]), "refresh" => SECONDS_10MINUTES ); From 43285a91929d8fc57bb670cc2e6c1c045883f262 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Thu, 3 Aug 2017 12:41:47 +0200 Subject: [PATCH 10/50] Added label in automatic graph --- .../include/functions_reporting.php | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index f64bb7d0ed..0959cebe38 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -5789,17 +5789,10 @@ function reporting_custom_graph($report, $content, $type = 'dinamic', require_once ($config["homedir"] . '/include/functions_graph.php'); - if ($type_report == 'automatic_graph') { - // Do none - } - else { - if ($config['metaconsole']) { - $id_meta = metaconsole_get_id_server($content["server_name"]); - - - $server = metaconsole_get_connection_by_id ($id_meta); - metaconsole_connect($server); - } + if ($config['metaconsole'] && $type_report != 'automatic_graph') { + $id_meta = metaconsole_get_id_server($content["server_name"]); + $server = metaconsole_get_connection_by_id ($id_meta); + metaconsole_connect($server); } $graph = db_get_row ("tgraph", "id_graph", $content['id_gs']); @@ -5853,6 +5846,22 @@ function reporting_custom_graph($report, $content, $type = 'dinamic', 'id_agent_module'=>$graph_item['id_agent_module']); } + if($type_report == 'automatic_graph'){ + $label = (isset($content['style']['label'])) ? $content['style']['label'] : ''; + if (!empty($label)) { + if ($config['metaconsole']) { + $id_meta = metaconsole_get_id_server($content["server_name"]); + $server = metaconsole_get_connection_by_id ($id_meta); + metaconsole_connect($server); + } + $label = reporting_label_macro($content, $label); + + if ($config['metaconsole']) { + metaconsole_restore_db(); + } + } + } + $labels[$graph_item['id_agent_module']] = $label; } } @@ -5909,15 +5918,11 @@ function reporting_custom_graph($report, $content, $type = 'dinamic', break; } - if ($type_report == 'automatic_graph') { - // Do none - } - else { - if ($config['metaconsole']) { - metaconsole_restore_db(); - } + if ($config['metaconsole'] && $type_report != 'automatic_graph') { + metaconsole_restore_db(); } + return reporting_check_structure_content($return); } From afc481098dde68367f92a973775eff3ae831f79c Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 3 Aug 2017 13:09:41 +0200 Subject: [PATCH 11/50] fixed error exportation csv in custom graphs --- .../include/graphs/flot/jquery.flot.exportdata.pandora.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js b/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js index bb7c5d56dd..e8bb747901 100644 --- a/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js +++ b/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js @@ -88,7 +88,10 @@ else if (typeof labels[index] !== 'undefined') date = labels[index]; - result.data.push([date, value,dataObject.label]); + var clean_label = dataObject.label; + clean_label = clean_label.replace( new RegExp("<.*?>", "g"), ""); + clean_label = clean_label.replace( new RegExp(";", "g"), ""); + result.data.push([date, value, clean_label]); }); } /* [ @@ -139,7 +142,7 @@ try { var elements = []; - var custom_graph = $('input:hidden[name=custom_graph]').value; + var custom_graph = $('#hidden-custom_graph').val(); if (custom_graph) { dataObject = retrieveDataOject(dataObjects); From 7d578093d90e2d6ff9a5b856c463a79915d96125 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Thu, 3 Aug 2017 13:13:34 +0200 Subject: [PATCH 12/50] Fixed label in automatic graph in node --- pandora_console/include/functions_reporting.php | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 0959cebe38..c8175ac92f 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -5846,22 +5846,6 @@ function reporting_custom_graph($report, $content, $type = 'dinamic', 'id_agent_module'=>$graph_item['id_agent_module']); } - if($type_report == 'automatic_graph'){ - $label = (isset($content['style']['label'])) ? $content['style']['label'] : ''; - if (!empty($label)) { - if ($config['metaconsole']) { - $id_meta = metaconsole_get_id_server($content["server_name"]); - $server = metaconsole_get_connection_by_id ($id_meta); - metaconsole_connect($server); - } - $label = reporting_label_macro($content, $label); - - if ($config['metaconsole']) { - metaconsole_restore_db(); - } - } - } - $labels[$graph_item['id_agent_module']] = $label; } } @@ -5922,7 +5906,6 @@ function reporting_custom_graph($report, $content, $type = 'dinamic', metaconsole_restore_db(); } - return reporting_check_structure_content($return); } From 55ed4ec84011ef1d641ef47cd50c349ec4a97b07 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 3 Aug 2017 13:51:56 +0200 Subject: [PATCH 13/50] fixed error cli version snmp --- pandora_server/lib/PandoraFMS/Core.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index b6d3a0fed4..54d96a0a60 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -2759,7 +2759,7 @@ sub pandora_create_module_from_hash ($$$) { # Encrypt SNMP v3 passwords. if ($parameters->{'id_tipo_modulo'} >= 15 && $parameters->{'id_tipo_modulo'} <= 18 && - $parameters->{'tcp_send'} == 3) { + $parameters->{'tcp_send'} eq '3') { $parameters->{'custom_string_2'} = pandora_input_password($pa_config, $parameters->{'custom_string_2'}); } From 6d2466cba2c9c051e1c3897fffc398c82176b01d Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 3 Aug 2017 15:07:49 +0200 Subject: [PATCH 14/50] fixed minor error --- pandora_server/util/pandora_manage.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index b7dc19e4ae..e9876f43c6 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -129,7 +129,7 @@ sub help_screen{ help_screen_line('--create_data_module', " [ \n\t \n\t \n\t \n\t \n\t ]", 'Add data server module to agent'); help_screen_line('--create_web_module', " [ \n\t \n\t \n\t \n\t \n\t ].\n\t The valid data types are web_data, web_proc, web_content_data or web_content_string", 'Add web server module to agent'); help_screen_line('--create_network_module', " \n\t [ \n\t \n\t \n\t \n\t \n\t ]", 'Add not snmp network module to agent'); - help_screen_line('--create_snmp_module', " \n\t [ \n\t \n\t \n\t \n\t \n\t + help_screen_line('--create_snmp_module', " \n\t [ \n\t \n\t \n\t \n\t \n\t \n\t \n\t ]", 'Add snmp network module to agent'); help_screen_line('--create_plugin_module', " \n\t [ \n\t \n\t \n\t \n\t \n\t \n\t ]", 'Add plug-in module to agent'); help_screen_line('--create_module_group', ''); From 2d3d9e782f5d158dfec7cdeb407c7db4b978af06 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 3 Aug 2017 17:09:27 +0200 Subject: [PATCH 15/50] fixed errors metaconsole reports serialize data --- pandora_console/include/functions_reporting.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index c8175ac92f..d46ea0759a 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -2447,7 +2447,14 @@ function reporting_database_serialized($report, $content) { $return['agent_name'] = $agent_name; $return['module_name'] = $module_name; - + if ($config['metaconsole']) { + $id_meta = metaconsole_get_id_server($content["server_name"]); + + + $server = metaconsole_get_connection_by_id ($id_meta); + metaconsole_connect($server); + } + $datelimit = $report["datetime"] - $content['period']; $search_in_history_db = db_search_in_history_db($datelimit); @@ -2523,6 +2530,10 @@ function reporting_database_serialized($report, $content) { $data[] = $row; } } + + if ($config['metaconsole']) { + metaconsole_restore_db(); + } $return["data"] = $data; From fba5a38482a39b53ef05be2a69dd59896d4edd72 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Wed, 9 Aug 2017 11:33:12 +0200 Subject: [PATCH 16/50] Fixed time range with user no admin --- .../operation/agentes/interface_traffic_graph_win.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandora_console/operation/agentes/interface_traffic_graph_win.php b/pandora_console/operation/agentes/interface_traffic_graph_win.php index 5dce55b101..8d676b4340 100644 --- a/pandora_console/operation/agentes/interface_traffic_graph_win.php +++ b/pandora_console/operation/agentes/interface_traffic_graph_win.php @@ -139,7 +139,10 @@ $interface_traffic_modules = array( } // Get input parameters - $period = (int) get_parameter('period', SECONDS_1HOUR); + $period = get_parameter ("period"); + if ($period == "") { + $period = get_parameter ("period_select", SECONDS_1DAY); + } $width = (int) get_parameter("width", 555); $height = (int) get_parameter("height", 245); $start_date = (string) get_parameter("start_date", date("Y-m-d")); From 70988d8c8c8bbd244ca3739eb9304e0d6b891b83 Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 10 Aug 2017 00:01:15 +0200 Subject: [PATCH 17/50] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 8c06d4c68c..5f9c101616 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.709-170809 +Version: 7.0NG.709-170810 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 6cec456223..1c6b787d4d 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.709-170809" +pandora_version="7.0NG.709-170810" 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 9ecda1d16d..c16468b92e 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.709'; -use constant AGENT_BUILD => '170809'; +use constant AGENT_BUILD => '170810'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index b1dca5a181..a778ccc059 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.709 -%define release 170809 +%define release 170810 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 29ca24cc08..2b281df13a 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.709 -%define release 170809 +%define release 170810 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 9bc0d6c4ba..f1b8644da7 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.709" -PI_BUILD="170809" +PI_BUILD="170810" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index b3aa936cb0..f2bb362264 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170809} +{170810} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index e9ee752438..8708179d46 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.709(Build 170809)") +#define PANDORA_VERSION ("7.0NG.709(Build 170810)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 732e897082..16b6a3f779 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.709(Build 170809))" + VALUE "ProductVersion", "(7.0NG.709(Build 170810))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 4ffbd96f74..6cce8d6b78 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.709-170809 +Version: 7.0NG.709-170810 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 05b9d583d7..558d712f0f 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.709-170809" +pandora_version="7.0NG.709-170810" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index a5e16e3ff6..04205964f6 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 = 'PC170809'; +$build_version = 'PC170810'; $pandora_version = 'v7.0NG.709'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index b9549887a7..9342f42eb5 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Thu, 10 Aug 2017 10:37:06 +0200 Subject: [PATCH 18/50] Updated version and build strings. --- pandora_agents/pc/AIX/pandora_agent.conf | 2 +- pandora_agents/pc/FreeBSD/pandora_agent.conf | 2 +- pandora_agents/pc/HP-UX/pandora_agent.conf | 2 +- pandora_agents/pc/Linux/pandora_agent.conf | 2 +- pandora_agents/pc/NT4/pandora_agent.conf | 2 +- pandora_agents/pc/SunOS/pandora_agent.conf | 2 +- pandora_agents/pc/Win32/pandora_agent.conf | 2 +- pandora_agents/shellscript/aix/pandora_agent.conf | 2 +- pandora_agents/shellscript/bsd-ipso/pandora_agent.conf | 2 +- pandora_agents/shellscript/hp-ux/pandora_agent.conf | 2 +- pandora_agents/shellscript/linux/pandora_agent.conf | 2 +- pandora_agents/shellscript/mac_osx/pandora_agent.conf | 2 +- pandora_agents/shellscript/openWRT/pandora_agent.conf | 2 +- pandora_agents/shellscript/solaris/pandora_agent.conf | 2 +- pandora_agents/unix/AIX/pandora_agent.conf | 2 +- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/Darwin/pandora_agent.conf | 2 +- pandora_agents/unix/FreeBSD/pandora_agent.conf | 2 +- pandora_agents/unix/HP-UX/pandora_agent.conf | 2 +- pandora_agents/unix/Linux/pandora_agent.conf | 2 +- pandora_agents/unix/NT4/pandora_agent.conf | 2 +- pandora_agents/unix/NetBSD/pandora_agent.conf | 2 +- pandora_agents/unix/SunOS/pandora_agent.conf | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 4 ++-- pandora_agents/unix/pandora_agent.spec | 4 ++-- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/bin/pandora_agent.conf | 2 +- pandora_agents/win32/installer/pandora.mpi | 4 ++-- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 4 ++-- pandora_console/pandora_console.spec | 4 ++-- pandora_console/pandora_console_install | 2 +- pandora_console/pandoradb_data.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/conf/pandora_server.conf.new | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/pandora_server.redhat.spec | 4 ++-- pandora_server/pandora_server.spec | 4 ++-- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 49 files changed, 56 insertions(+), 56 deletions(-) diff --git a/pandora_agents/pc/AIX/pandora_agent.conf b/pandora_agents/pc/AIX/pandora_agent.conf index 77d34249b3..de9e79aa1d 100644 --- a/pandora_agents/pc/AIX/pandora_agent.conf +++ b/pandora_agents/pc/AIX/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.709, AIX version +# Version 7.0NG.710, AIX version # Licensed under GPL license v2, # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/FreeBSD/pandora_agent.conf b/pandora_agents/pc/FreeBSD/pandora_agent.conf index f33e609eeb..ee89a53dbb 100644 --- a/pandora_agents/pc/FreeBSD/pandora_agent.conf +++ b/pandora_agents/pc/FreeBSD/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.709, FreeBSD Version +# Version 7.0NG.710, FreeBSD Version # Licensed under GPL license v2, # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/HP-UX/pandora_agent.conf b/pandora_agents/pc/HP-UX/pandora_agent.conf index e17adcc4c3..5f5de4fa76 100644 --- a/pandora_agents/pc/HP-UX/pandora_agent.conf +++ b/pandora_agents/pc/HP-UX/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.709, HP-UX Version +# Version 7.0NG.710, HP-UX Version # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/Linux/pandora_agent.conf b/pandora_agents/pc/Linux/pandora_agent.conf index a5ba94c7ee..5093e1effa 100644 --- a/pandora_agents/pc/Linux/pandora_agent.conf +++ b/pandora_agents/pc/Linux/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.709, GNU/Linux +# Version 7.0NG.710, GNU/Linux # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/NT4/pandora_agent.conf b/pandora_agents/pc/NT4/pandora_agent.conf index 77e78b23f2..3afa73c7b0 100644 --- a/pandora_agents/pc/NT4/pandora_agent.conf +++ b/pandora_agents/pc/NT4/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.709, GNU/Linux +# Version 7.0NG.710, GNU/Linux # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/SunOS/pandora_agent.conf b/pandora_agents/pc/SunOS/pandora_agent.conf index 8ee5d38f40..ef6d1fdef8 100644 --- a/pandora_agents/pc/SunOS/pandora_agent.conf +++ b/pandora_agents/pc/SunOS/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.709, Solaris Version +# Version 7.0NG.710, Solaris Version # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/Win32/pandora_agent.conf b/pandora_agents/pc/Win32/pandora_agent.conf index 2ebef28d78..fa941aa97b 100644 --- a/pandora_agents/pc/Win32/pandora_agent.conf +++ b/pandora_agents/pc/Win32/pandora_agent.conf @@ -1,6 +1,6 @@ # Base config file for Pandora FMS Windows Agent # (c) 2006-2010 Artica Soluciones Tecnologicas -# Version 7.0NG.709 +# Version 7.0NG.710 # This program is Free Software, you can redistribute it and/or modify it # under the terms of the GNU General Public Licence as published by the Free Software diff --git a/pandora_agents/shellscript/aix/pandora_agent.conf b/pandora_agents/shellscript/aix/pandora_agent.conf index 987de91b06..07e7ad3da0 100644 --- a/pandora_agents/shellscript/aix/pandora_agent.conf +++ b/pandora_agents/shellscript/aix/pandora_agent.conf @@ -1,6 +1,6 @@ # Fichero de configuracion base de agentes de Pandora # Base config file for Pandora agents -# Version 7.0NG.709, AIX version +# Version 7.0NG.710, AIX version # General Parameters # ================== diff --git a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf index 712756d13c..63f463a932 100644 --- a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf +++ b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf @@ -1,6 +1,6 @@ # Fichero de configuracion base de agentes de Pandora # Base config file for Pandora agents -# Version 7.0NG.709 +# Version 7.0NG.710 # FreeBSD/IPSO version # Licenced under GPL licence, 2003-2007 Sancho Lerena diff --git a/pandora_agents/shellscript/hp-ux/pandora_agent.conf b/pandora_agents/shellscript/hp-ux/pandora_agent.conf index 7113ea627b..20951ab529 100644 --- a/pandora_agents/shellscript/hp-ux/pandora_agent.conf +++ b/pandora_agents/shellscript/hp-ux/pandora_agent.conf @@ -1,6 +1,6 @@ # Fichero de configuracion base de agentes de Pandora # Base config file for Pandora agents -# Version 7.0NG.709, HPUX Version +# Version 7.0NG.710, HPUX Version # General Parameters # ================== diff --git a/pandora_agents/shellscript/linux/pandora_agent.conf b/pandora_agents/shellscript/linux/pandora_agent.conf index b35313bcc4..3a2d4a3e4b 100644 --- a/pandora_agents/shellscript/linux/pandora_agent.conf +++ b/pandora_agents/shellscript/linux/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.709 +# Version 7.0NG.710 # Licensed under GPL license v2, # (c) 2003-2010 Artica Soluciones Tecnologicas # please visit http://pandora.sourceforge.net diff --git a/pandora_agents/shellscript/mac_osx/pandora_agent.conf b/pandora_agents/shellscript/mac_osx/pandora_agent.conf index 609632ea33..88b68a7a25 100644 --- a/pandora_agents/shellscript/mac_osx/pandora_agent.conf +++ b/pandora_agents/shellscript/mac_osx/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.709 +# Version 7.0NG.710 # Licensed under GPL license v2, # (c) 2003-2009 Artica Soluciones Tecnologicas # please visit http://pandora.sourceforge.net diff --git a/pandora_agents/shellscript/openWRT/pandora_agent.conf b/pandora_agents/shellscript/openWRT/pandora_agent.conf index 00abe55972..54ece23c85 100644 --- a/pandora_agents/shellscript/openWRT/pandora_agent.conf +++ b/pandora_agents/shellscript/openWRT/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.709 +# Version 7.0NG.710 # Licensed under GPL license v2, # please visit http://pandora.sourceforge.net diff --git a/pandora_agents/shellscript/solaris/pandora_agent.conf b/pandora_agents/shellscript/solaris/pandora_agent.conf index abbb8bd535..70cd00c95f 100644 --- a/pandora_agents/shellscript/solaris/pandora_agent.conf +++ b/pandora_agents/shellscript/solaris/pandora_agent.conf @@ -1,6 +1,6 @@ # Fichero de configuracion base de agentes de Pandora # Base config file for Pandora agents -# Version 7.0NG.709, Solaris version +# Version 7.0NG.710, Solaris version # General Parameters # ================== diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf index 914716f866..5c0c53125b 100644 --- a/pandora_agents/unix/AIX/pandora_agent.conf +++ b/pandora_agents/unix/AIX/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.709, AIX version +# Version 7.0NG.710, AIX version # Licensed under GPL license v2, # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 5f9c101616..902bb45aa6 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.709-170810 +Version: 7.0NG.710 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 1c6b787d4d..b0cbcc9f56 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.709-170810" +pandora_version="7.0NG.710" 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/Darwin/pandora_agent.conf b/pandora_agents/unix/Darwin/pandora_agent.conf index a1d986c5c3..be6d94e65a 100644 --- a/pandora_agents/unix/Darwin/pandora_agent.conf +++ b/pandora_agents/unix/Darwin/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.709, GNU/Linux +# Version 7.0NG.710, GNU/Linux # Licensed under GPL license v2, # Copyright (c) 2003-2012 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/FreeBSD/pandora_agent.conf b/pandora_agents/unix/FreeBSD/pandora_agent.conf index bbfe88e1fa..6862ed1ee6 100644 --- a/pandora_agents/unix/FreeBSD/pandora_agent.conf +++ b/pandora_agents/unix/FreeBSD/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.709, FreeBSD Version +# Version 7.0NG.710, FreeBSD Version # Licensed under GPL license v2, # Copyright (c) 2003-2016 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/HP-UX/pandora_agent.conf b/pandora_agents/unix/HP-UX/pandora_agent.conf index 50ccf8fe55..57c45b4df6 100644 --- a/pandora_agents/unix/HP-UX/pandora_agent.conf +++ b/pandora_agents/unix/HP-UX/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.709, HP-UX Version +# Version 7.0NG.710, HP-UX Version # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf index af2bd05ab3..842a51aad7 100644 --- a/pandora_agents/unix/Linux/pandora_agent.conf +++ b/pandora_agents/unix/Linux/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.709, GNU/Linux +# Version 7.0NG.710, GNU/Linux # Licensed under GPL license v2, # Copyright (c) 2003-2014 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/NT4/pandora_agent.conf b/pandora_agents/unix/NT4/pandora_agent.conf index 4b97428ffe..b8c11f135e 100644 --- a/pandora_agents/unix/NT4/pandora_agent.conf +++ b/pandora_agents/unix/NT4/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.709, GNU/Linux +# Version 7.0NG.710, GNU/Linux # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/NetBSD/pandora_agent.conf b/pandora_agents/unix/NetBSD/pandora_agent.conf index 63bddc1d66..6c8eb8b422 100644 --- a/pandora_agents/unix/NetBSD/pandora_agent.conf +++ b/pandora_agents/unix/NetBSD/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.709, NetBSD Version +# Version 7.0NG.710, NetBSD Version # Licensed under GPL license v2, # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/SunOS/pandora_agent.conf b/pandora_agents/unix/SunOS/pandora_agent.conf index 24902ea131..5a4f581471 100644 --- a/pandora_agents/unix/SunOS/pandora_agent.conf +++ b/pandora_agents/unix/SunOS/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.709, Solaris Version +# Version 7.0NG.710, Solaris Version # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index c16468b92e..459b91d04f 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -40,7 +40,7 @@ my $Sem = undef; # Semaphore used to control the number of threads my $ThreadSem = undef; -use constant AGENT_VERSION => '7.0NG.709'; +use constant AGENT_VERSION => '7.0NG.710'; use constant AGENT_BUILD => '170810'; # Agent log default file size maximum and instances diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index a778ccc059..5028e2ef7d 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -2,8 +2,8 @@ #Pandora FMS Linux Agent # %define name pandorafms_agent_unix -%define version 7.0NG.709 -%define release 170810 +%define version 7.0NG.710 +%define release 1 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 2b281df13a..c072a4ecef 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -2,8 +2,8 @@ #Pandora FMS Linux Agent # %define name pandorafms_agent_unix -%define version 7.0NG.709 -%define release 170810 +%define version 7.0NG.710 +%define release 1 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 f1b8644da7..faafc5642d 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -9,7 +9,7 @@ # Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license. # ********************************************************************** -PI_VERSION="7.0NG.709" +PI_VERSION="7.0NG.710" PI_BUILD="170810" OS_NAME=`uname -s` diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf index ca2b3526f4..ea387c7f6b 100644 --- a/pandora_agents/win32/bin/pandora_agent.conf +++ b/pandora_agents/win32/bin/pandora_agent.conf @@ -1,6 +1,6 @@ # Base config file for Pandora FMS Windows Agent # (c) 2006-2014 Artica Soluciones Tecnologicas -# Version 7.0NG.709 +# Version 7.0NG.710 # This program is Free Software, you can redistribute it and/or modify it # under the terms of the GNU General Public Licence as published by the Free Software diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index f2bb362264..96786e4f32 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -3,7 +3,7 @@ AllowLanguageSelection {Yes} AppName -{Pandora FMS Windows Agent v7.0NG.709} +{Pandora FMS Windows Agent v7.0NG.710} ApplicationID {17E3D2CF-CA02-406B-8A80-9D31C17BD08F} @@ -2387,7 +2387,7 @@ Windows,BuildSeparateArchives {No} Windows,Executable -{<%AppName%>-<%Version%>-Setup<%Ext%>} +{<%AppName%>-Setup<%Ext%>} Windows,FileDescription {<%AppName%> <%Version%> Setup} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 8708179d46..74a349e35a 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.709(Build 170810)") +#define PANDORA_VERSION ("7.0NG.710(Build 170810)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 16b6a3f779..acbd8469c6 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.709(Build 170810))" + VALUE "ProductVersion", "(7.0NG.710(Build 170810))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 6cce8d6b78..5302798b19 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.709-170810 +Version: 7.0NG.710 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 558d712f0f..38b0546630 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.709-170810" +pandora_version="7.0NG.710" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 04205964f6..38c24ddd10 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -23,7 +23,7 @@ * Pandora build version and version */ $build_version = 'PC170810'; -$pandora_version = 'v7.0NG.709'; +$pandora_version = 'v7.0NG.710'; // Do not overwrite default timezone set if defined. $script_tz = @date_default_timezone_get(); diff --git a/pandora_console/install.php b/pandora_console/install.php index 9342f42eb5..470f146d80 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -70,7 +70,7 @@
Date: Thu, 10 Aug 2017 15:45:53 +0200 Subject: [PATCH 19/50] Fixed issue with simple value --- pandora_console/include/ajax/visual_console_builder.ajax.php | 1 - 1 file changed, 1 deletion(-) diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php index 580a089b4e..6f2bae0b40 100755 --- a/pandora_console/include/ajax/visual_console_builder.ajax.php +++ b/pandora_console/include/ajax/visual_console_builder.ajax.php @@ -457,7 +457,6 @@ switch ($action) { $values['period'] = $period; $values['width'] = $width; } - break; case 'percentile_bar': case 'percentile_item': case 'static_graph': From 61ffae2ae18321e6b1cd039153b4172f1f735a1b Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 10 Aug 2017 17:45:00 +0200 Subject: [PATCH 20/50] fixed errors in visual console on simple value --- pandora_console/include/functions_visual_map.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index 1869e8cb39..e88c1ffe02 100755 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -1538,7 +1538,7 @@ function visual_map_print_item($mode = "read", $layoutData, if(get_parameter('action') == 'edit'){ //html_debug($layoutData); //echo 'Data value'; - if(strip_tags($io_safe_output_text) != '_VALUE_'){ + if( (strip_tags($io_safe_output_text) != '_VALUE_') || (strip_tags($io_safe_output_text) != '(_VALUE_)') ){ echo $io_safe_output_text; } else{ From 31d5699a2b495b07c7bd21b0c441206adc333a72 Mon Sep 17 00:00:00 2001 From: artica Date: Fri, 11 Aug 2017 00:01:13 +0200 Subject: [PATCH 21/50] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 4 ++-- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 23 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 902bb45aa6..e12de89272 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.710 +Version: 7.0NG.710-170811 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 b0cbcc9f56..42a1f4e3ae 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.710" +pandora_version="7.0NG.710-170811" 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 459b91d04f..e545115c26 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.710'; -use constant AGENT_BUILD => '170810'; +use constant AGENT_BUILD => '170811'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 5028e2ef7d..251303a761 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.710 -%define release 1 +%define release 170811 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 c072a4ecef..891ecc8522 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.710 -%define release 1 +%define release 170811 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 faafc5642d..dd7aa395e6 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.710" -PI_BUILD="170810" +PI_BUILD="170811" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 96786e4f32..fdc8ac959e 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170810} +{170811} ViewReadme {Yes} @@ -2387,7 +2387,7 @@ Windows,BuildSeparateArchives {No} Windows,Executable -{<%AppName%>-Setup<%Ext%>} +{<%AppName%>-<%Version%>-Setup<%Ext%>} Windows,FileDescription {<%AppName%> <%Version%> Setup} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 74a349e35a..92b35794bf 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.710(Build 170810)") +#define PANDORA_VERSION ("7.0NG.710(Build 170811)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index acbd8469c6..703bbe6867 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.710(Build 170810))" + VALUE "ProductVersion", "(7.0NG.710(Build 170811))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 5302798b19..72f215144b 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.710 +Version: 7.0NG.710-170811 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 38b0546630..7e3f1bc402 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.710" +pandora_version="7.0NG.710-170811" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 38c24ddd10..9a6d07402d 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 = 'PC170810'; +$build_version = 'PC170811'; $pandora_version = 'v7.0NG.710'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 470f146d80..fd83bc4054 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Fri, 11 Aug 2017 09:13:26 +0200 Subject: [PATCH 22/50] fixed errors visual console --- .../godmode/reporting/visual_console_builder.editor.js | 6 +++--- pandora_console/include/functions_visual_map.php | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js index ee2c23c5de..00d86be5a1 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.js +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js @@ -412,7 +412,9 @@ function update_button_palette_callback() { return; } $("#" + idItem).html(values['label']); - if(values['label'].replace( /<.*?>/g, '' ) == '_VALUE_'){ + if( (values['label'].replace( /<.*?>/g, '' ) != '_VALUE_') + && (values['label'].replace( /<.*?>/g, '' ) != '(_VALUE_)') ){ + $("#text_" + idItem).html(''); $("#" + idItem).html(''); } @@ -2751,8 +2753,6 @@ function updateDB(type, idElement , values, event) { update_user_line(type, idElement, top, left); break; default: - console.log(values); - console.log(idElement); if ((typeof(values['mov_left']) != 'undefined') && (typeof(values['mov_top']) != 'undefined')) { top = parseInt($("#" + idElement) diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index e88c1ffe02..3ea05cc8b1 100755 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -1547,7 +1547,10 @@ function visual_map_print_item($mode = "read", $layoutData, } else{ - if(strip_tags($io_safe_output_text) != '_VALUE_'){ + if(strip_tags($io_safe_output_text) == '_VALUE_'){ + echo str_replace(array('_VALUE_','_value_'), $value, $io_safe_output_text); + } + elseif(strip_tags($io_safe_output_text) == '(_VALUE_)'){ echo str_replace(array('_VALUE_','_value_'), $value, $io_safe_output_text); } else{ From 3c18f706fa81729e6a7d43d665f1d6113f2b04ea Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Fri, 11 Aug 2017 11:48:25 +0200 Subject: [PATCH 23/50] fixed errors in visual console on simple value 2 --- .../reporting/visual_console_builder.editor.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js index 00d86be5a1..3cea48be21 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.js +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js @@ -405,12 +405,12 @@ function update_button_palette_callback() { break; case 'simple_value': //checkpoint - if(($('#text-label_ifr').contents().find('#tinymce p').html() == '_VALUE_' || - $('#text-label_ifr').contents().find('#tinymce').html() == '_VALUE_') - && $('#data_image_check').html() != 'On'){ - alert('_VALUE_ exactly value is only enable for data image. Please change label text or select a data image module.'); - return; - } + // if(($('#text-label_ifr').contents().find('#tinymce p').html() == '_VALUE_' || + // $('#text-label_ifr').contents().find('#tinymce').html() == '_VALUE_') + // && $('#data_image_check').html() != 'On'){ + // alert('_VALUE_ exactly value is only enable for data image. Please change label text or select a data image module.'); + // return; + // } $("#" + idItem).html(values['label']); if( (values['label'].replace( /<.*?>/g, '' ) != '_VALUE_') && (values['label'].replace( /<.*?>/g, '' ) != '(_VALUE_)') ){ From 5542bd89479a42da5edff74c0a7139f6eef38c18 Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 12 Aug 2017 00:01:13 +0200 Subject: [PATCH 24/50] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index e12de89272..8cdcbaf013 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.710-170811 +Version: 7.0NG.710-170812 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 42a1f4e3ae..cc69f188a1 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.710-170811" +pandora_version="7.0NG.710-170812" 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 e545115c26..01ae1677db 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.710'; -use constant AGENT_BUILD => '170811'; +use constant AGENT_BUILD => '170812'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 251303a761..0609402ba2 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.710 -%define release 170811 +%define release 170812 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 891ecc8522..4b6b6bbb7c 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.710 -%define release 170811 +%define release 170812 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 dd7aa395e6..58f5b57347 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.710" -PI_BUILD="170811" +PI_BUILD="170812" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index fdc8ac959e..c51ffbb968 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170811} +{170812} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 92b35794bf..3c72052baf 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.710(Build 170811)") +#define PANDORA_VERSION ("7.0NG.710(Build 170812)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 703bbe6867..bd59ca7433 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.710(Build 170811))" + VALUE "ProductVersion", "(7.0NG.710(Build 170812))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 72f215144b..2b16b31616 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.710-170811 +Version: 7.0NG.710-170812 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 7e3f1bc402..32b2b62b97 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.710-170811" +pandora_version="7.0NG.710-170812" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 9a6d07402d..f58f4c33be 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 = 'PC170811'; +$build_version = 'PC170812'; $pandora_version = 'v7.0NG.710'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index fd83bc4054..9fee2f83e1 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Sun, 13 Aug 2017 00:01:12 +0200 Subject: [PATCH 25/50] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 8cdcbaf013..1e6912e9af 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.710-170812 +Version: 7.0NG.710-170813 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 cc69f188a1..a79d69ee92 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.710-170812" +pandora_version="7.0NG.710-170813" 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 01ae1677db..1d343901ec 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.710'; -use constant AGENT_BUILD => '170812'; +use constant AGENT_BUILD => '170813'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 0609402ba2..719c204c34 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.710 -%define release 170812 +%define release 170813 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 4b6b6bbb7c..8e64e6936d 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.710 -%define release 170812 +%define release 170813 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 58f5b57347..5565101120 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.710" -PI_BUILD="170812" +PI_BUILD="170813" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index c51ffbb968..079b7c75f4 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170812} +{170813} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 3c72052baf..0b20eaa41c 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.710(Build 170812)") +#define PANDORA_VERSION ("7.0NG.710(Build 170813)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index bd59ca7433..005daadacf 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.710(Build 170812))" + VALUE "ProductVersion", "(7.0NG.710(Build 170813))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 2b16b31616..a094ff261b 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.710-170812 +Version: 7.0NG.710-170813 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 32b2b62b97..0b345d45d2 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.710-170812" +pandora_version="7.0NG.710-170813" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index f58f4c33be..6278049eae 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 = 'PC170812'; +$build_version = 'PC170813'; $pandora_version = 'v7.0NG.710'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 9fee2f83e1..111f837ed5 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Mon, 14 Aug 2017 00:01:13 +0200 Subject: [PATCH 26/50] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 1e6912e9af..d237ebbb86 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.710-170813 +Version: 7.0NG.710-170814 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 a79d69ee92..cd388a7756 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.710-170813" +pandora_version="7.0NG.710-170814" 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 1d343901ec..bfbf06947a 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.710'; -use constant AGENT_BUILD => '170813'; +use constant AGENT_BUILD => '170814'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 719c204c34..960499bd88 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.710 -%define release 170813 +%define release 170814 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 8e64e6936d..df40ac3401 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.710 -%define release 170813 +%define release 170814 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 5565101120..912685dd4a 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.710" -PI_BUILD="170813" +PI_BUILD="170814" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 079b7c75f4..4b2ee2bfe6 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170813} +{170814} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 0b20eaa41c..f317542ecd 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.710(Build 170813)") +#define PANDORA_VERSION ("7.0NG.710(Build 170814)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 005daadacf..be3cd5af52 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.710(Build 170813))" + VALUE "ProductVersion", "(7.0NG.710(Build 170814))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index a094ff261b..0c8325ffc5 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.710-170813 +Version: 7.0NG.710-170814 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 0b345d45d2..3f318005a9 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.710-170813" +pandora_version="7.0NG.710-170814" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 6278049eae..f9ec6e8fb4 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 = 'PC170813'; +$build_version = 'PC170814'; $pandora_version = 'v7.0NG.710'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 111f837ed5..b239c780e7 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Mon, 14 Aug 2017 12:36:49 +0200 Subject: [PATCH 27/50] Xaxisname deleted from xaxes --- pandora_console/include/graphs/flot/pandora.flot.js | 1 - 1 file changed, 1 deletion(-) diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js index 78510da704..ee108f10b8 100644 --- a/pandora_console/include/graphs/flot/pandora.flot.js +++ b/pandora_console/include/graphs/flot/pandora.flot.js @@ -1476,7 +1476,6 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, xaxes: [{ axisLabelFontSizePixels: font_size, axisLabelUseCanvas: false, - axisLabel: xaxisname, tickFormatter: xFormatter, labelHeight: 50, color: '', From e99ef7d0f10aa207143396a77b46000ea7bced2f Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Mon, 14 Aug 2017 14:53:56 +0200 Subject: [PATCH 28/50] Fixed --- .../include/functions_visual_map.php | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index 3ea05cc8b1..8fa2492fc3 100755 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -1531,32 +1531,22 @@ function visual_map_print_item($mode = "read", $layoutData, } } - //$io_safe_output_text = str_replace(array('_VALUE_','_value_'), $value, $io_safe_output_text); - - - if(get_parameter('action') == 'edit'){ - //html_debug($layoutData); - //echo 'Data value'; - if( (strip_tags($io_safe_output_text) != '_VALUE_') || (strip_tags($io_safe_output_text) != '(_VALUE_)') ){ + if( (strip_tags($io_safe_output_text) != '_VALUE_') || (strip_tags($io_safe_output_text) != '(_VALUE_)') ) { echo $io_safe_output_text; } - else{ + else { echo ""; } - + } else { + if(strrpos(strip_tags($io_safe_output_text),'(_VALUE_)') !== false || (strip_tags($io_safe_output_text) == '(_VALUE_)')) { + echo str_replace(array("(_VALUE_)","(_value_)"), $value, $io_safe_output_text); } - else{ - if(strip_tags($io_safe_output_text) == '_VALUE_'){ + elseif(strrpos(strip_tags($io_safe_output_text),'_VALUE_') !== false || (strip_tags($io_safe_output_text) == '_VALUE_')) { echo str_replace(array('_VALUE_','_value_'), $value, $io_safe_output_text); - } - elseif(strip_tags($io_safe_output_text) == '(_VALUE_)'){ - echo str_replace(array('_VALUE_','_value_'), $value, $io_safe_output_text); - } - else{ + } else { echo str_replace('>', ' style="width:'.$layoutData['width'].'px">',$value); } - } //Restore db connection From c08e17084f65af5ca68f2ec1f56ddfa8a613c1f4 Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 15 Aug 2017 00:01:13 +0200 Subject: [PATCH 29/50] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index d237ebbb86..7bc2ea8fe5 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.710-170814 +Version: 7.0NG.710-170815 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 cd388a7756..69936124c2 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.710-170814" +pandora_version="7.0NG.710-170815" 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 bfbf06947a..b1bf1dc9ec 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.710'; -use constant AGENT_BUILD => '170814'; +use constant AGENT_BUILD => '170815'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 960499bd88..531ed811bf 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.710 -%define release 170814 +%define release 170815 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 df40ac3401..adf92a6fd2 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.710 -%define release 170814 +%define release 170815 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 912685dd4a..3792da9b81 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.710" -PI_BUILD="170814" +PI_BUILD="170815" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 4b2ee2bfe6..1e4cde523b 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170814} +{170815} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index f317542ecd..1cd29a7a7b 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.710(Build 170814)") +#define PANDORA_VERSION ("7.0NG.710(Build 170815)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index be3cd5af52..539861b144 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.710(Build 170814))" + VALUE "ProductVersion", "(7.0NG.710(Build 170815))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 0c8325ffc5..241ca8a788 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.710-170814 +Version: 7.0NG.710-170815 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 3f318005a9..3e1bf2e1ab 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.710-170814" +pandora_version="7.0NG.710-170815" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index f9ec6e8fb4..825e785e94 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 = 'PC170814'; +$build_version = 'PC170815'; $pandora_version = 'v7.0NG.710'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index b239c780e7..30f1e0ba24 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Wed, 16 Aug 2017 00:01:15 +0200 Subject: [PATCH 30/50] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 7bc2ea8fe5..9aa3c81c5c 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.710-170815 +Version: 7.0NG.710-170816 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 69936124c2..74b4f8c06f 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.710-170815" +pandora_version="7.0NG.710-170816" 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 b1bf1dc9ec..e3d4c20811 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.710'; -use constant AGENT_BUILD => '170815'; +use constant AGENT_BUILD => '170816'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 531ed811bf..60535b98da 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.710 -%define release 170815 +%define release 170816 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 adf92a6fd2..9e7f3945a7 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.710 -%define release 170815 +%define release 170816 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 3792da9b81..d086362b4a 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.710" -PI_BUILD="170815" +PI_BUILD="170816" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 1e4cde523b..46676655c9 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170815} +{170816} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 1cd29a7a7b..e97638ef3a 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.710(Build 170815)") +#define PANDORA_VERSION ("7.0NG.710(Build 170816)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 539861b144..9c35dd9120 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.710(Build 170815))" + VALUE "ProductVersion", "(7.0NG.710(Build 170816))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 241ca8a788..697371d76e 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.710-170815 +Version: 7.0NG.710-170816 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 3e1bf2e1ab..a88382467d 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.710-170815" +pandora_version="7.0NG.710-170816" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 825e785e94..0dd2e494d3 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 = 'PC170815'; +$build_version = 'PC170816'; $pandora_version = 'v7.0NG.710'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 30f1e0ba24..46f20bdf5e 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Thu, 17 Aug 2017 18:38:12 +0200 Subject: [PATCH 31/50] wux console view --- pandora_console/include/graphs/fgraph.php | 4 +- .../include/graphs/flot/pandora.flot.js | 13 ++- .../include/graphs/functions_flot.php | 11 ++- pandora_console/include/styles/pandora.css | 83 +++++++++++++++++++ .../operation/agentes/ver_agente.php | 10 ++- 5 files changed, 114 insertions(+), 7 deletions(-) diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php index ea11435d8b..c36529b7f7 100644 --- a/pandora_console/include/graphs/fgraph.php +++ b/pandora_console/include/graphs/fgraph.php @@ -178,7 +178,7 @@ function vbar_graph($flash_chart, $chart_data, $width, $height, $color, $legend, $long_index, $no_data_image, $xaxisname = "", $yaxisname = "", $water_mark = "", $font = '', $font_size = '', $unit = '', $ttl = 1, $homeurl = '', $backgroundColor = 'white', - $from_ux = false) { + $from_ux = false, $from_wux = false) { setup_watermark($water_mark, $water_mark_file, $water_mark_url); if (empty($chart_data)) { @@ -188,7 +188,7 @@ function vbar_graph($flash_chart, $chart_data, $width, $height, if ($flash_chart) { return flot_vcolumn_chart ($chart_data, $width, $height, $color, $legend, $long_index, $homeurl, $unit, $water_mark_url, - $homedir,$font,$font_size, $from_ux); + $homedir,$font,$font_size, $from_ux, $from_wux); } else { $graph = array(); diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js index ee108f10b8..d59d72ec4c 100644 --- a/pandora_console/include/graphs/flot/pandora.flot.js +++ b/pandora_console/include/graphs/flot/pandora.flot.js @@ -457,7 +457,7 @@ function showTooltip(x, y, color, contents) { }).appendTo("body").fadeIn(200); } -function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors, water_mark, maxvalue, water_mark, separator, separator2, font, font_size , from_ux) { +function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors, water_mark, maxvalue, water_mark, separator, separator2, font, font_size , from_ux, from_wux) { values = values.split(separator2); legend = legend.split(separator); font = font.split("/").pop().split(".").shift(); @@ -552,6 +552,17 @@ function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors, } }; + if(from_wux){ + options.series.bars.barWidth = 0.5; + options.grid.aboveData = true; + options.grid.borderWidth = 0; + options.grid.markings = [ { xaxis: { from: -0.25, to: -0.25 }, color: "#000" }, + { yaxis: { from: 0, to: 0 }, color: "#000" }]; + + options.xaxis.tickLength = 0; + options.yaxis.tickLength = 0; + } + if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) options.xaxis.labelWidth = 100; diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php index 48b9db9652..4eebbfe3a2 100644 --- a/pandora_console/include/graphs/functions_flot.php +++ b/pandora_console/include/graphs/functions_flot.php @@ -752,7 +752,7 @@ function flot_hcolumn_chart ($graph_data, $width, $height, $water_mark, $font = } // Returns a 3D column chart -function flot_vcolumn_chart ($graph_data, $width, $height, $color, $legend, $long_index, $homeurl, $unit, $water_mark, $homedir, $font, $font_size, $from_ux) { +function flot_vcolumn_chart ($graph_data, $width, $height, $color, $legend, $long_index, $homeurl, $unit, $water_mark, $homedir, $font, $font_size, $from_ux, $from_wux) { global $config; include_javascript_dependencies_flot_graph(); @@ -835,10 +835,15 @@ function flot_vcolumn_chart ($graph_data, $width, $height, $color, $legend, $lon $return .= ""; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 9537114e0e..5077e47863 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -4191,4 +4191,87 @@ div#footer_help{ #mssg_error_div{ color: red; font-size: 12px; +} + +/* +* View WUX +*/ + +.wux_global_result_container{ + width: 100%; + margin-top: 30px; + margin-bottom: 30px; +} + +.wux_global_result_title{ + width: 100%; + text-align: center; + color:white; + background-color: #373737; + border: 1px solid #373737; + height: 30px; +} + +.wux_global_result_title p { + margin: 8px; +} + +.wux_global_result_content{ + width: 100%; + border: 1px solid #e2e2e2; + height: 120px; +} + +.wux_global_result_content_left{ + float:left; + width: 40%; + text-align: center; +} + +.wux_global_result_content_left ul{ + display: inline-flex; + margin-top: 23px; +} + + +.wux_global_result_content_left ul li p{ + margin-top: 30px; + margin-right: 10px; + margin-left: 10px; +} + +.wux_global_result_content_right{ + float:right; + width: 60%; +} + +.wux_global_result_content_right ul{ + display: inline-flex; + margin-top: 23px; +} + +.wux_global_result_content_right ul li p{ + margin-top: 30px; + margin-right: 10px; + margin-left: 10px; +} + +.wux_transaction_container{ + width: 100%; + margin-bottom: 30px; +} + +.wux_result_transaction{ + width: 33%; + float: left; +} + +.wux_transaction_graphs{ + width: 33%; + float: left; +} + +.wux_transaction_graphs_pie{ + width: 33%; + float: left; } \ No newline at end of file diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index 381b089b68..75d090485f 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -1047,6 +1047,10 @@ $ux_console_tab = enterprise_hook('ux_console_tab'); if ($ux_console_tab == -1) $ux_console_tab = ""; +/* UX Console */ +$wux_console_tab = enterprise_hook('wux_console_tab'); +if ($wux_console_tab == -1) + $wux_console_tab = ""; /* GIS tab */ $gistab=""; @@ -1178,7 +1182,8 @@ $onheader = array('manage' => $managetab, 'custom' => $custom_fields, 'graphs' => $graphs, 'policy' => $policyTab, - 'ux_console' => $ux_console_tab); + 'ux_console' => $ux_console_tab, + 'wux_console' => $wux_console_tab); //Added after it exists // If the agent has incidents associated @@ -1291,6 +1296,9 @@ switch ($tab) { case "ux_console_tab": enterprise_include ("operation/agentes/ux_console_view.php"); break; + case "wux_console_tab": + enterprise_include ("operation/agentes/wux_console_view.php"); + break; case "graphs"; require("operation/agentes/graphs.php"); break; From f0efe69ad4c04e53e18d40c369c071af0feff0f9 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 18 Aug 2017 12:02:47 +0200 Subject: [PATCH 32/50] fixed error in wux --- pandora_console/images/error_1.png | Bin 0 -> 2229 bytes pandora_console/images/exito.png | Bin 0 -> 2314 bytes pandora_console/include/styles/pandora.css | 19 ++++++++++++++----- 3 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 pandora_console/images/error_1.png create mode 100644 pandora_console/images/exito.png diff --git a/pandora_console/images/error_1.png b/pandora_console/images/error_1.png new file mode 100644 index 0000000000000000000000000000000000000000..8715248d54f67423bd726d54d777ac2e41b61c20 GIT binary patch literal 2229 zcmV;m2uk;fP)VefB>RzS|T=Y5aTuUFcAP!@5yy3zJv`jRDcSh;Rv+k0D3VeKq%RQ${Q51moFLq z#>Aj&+YfUzQHc;EZvaa`Y{ezI>tVTa0nrA701pq&%m@wp1Mq?n$VtQ-iXfK)g9L^_ z;Q!sbq$NdCk{>ZChLO@VjxVh<5>Zaw2T}@Hq!thgPJjR!dWexgP|OEX2{@z^fx)qW zB!htlf|@A-q-JrFT4qE7P$NK)R%sf=a3&-}_fr^O0??uvqxt1Pg~ae4y{Wk#t1>JF z5Tmj(-a-lHYM6_$rT|zQ7G@C0P^K9(@HRhSt|nMc<1zqG0~CA9i5LU$8H%&*jFHfR z-X{kz5i%4Oro;pf(FP+Mid>rzV>ry<3HZVnr7wa-3~xh^8dVh5UIq{}QnT(u?!Gio zXzm7D6q^Tt4s#@?pm%^aqo~s&#bN!3~2j3`IrNLFfi_l8O!58(VaR zZo&$%0V8w-CMdO~RD$5djxkMDOSy1>hvPWk|Nj&~O1M40z^Y~!(gI}2&Z?h%3e)FN4cdhV zU`J|4rqY22=*-Y|Vk{Lq?aWf%0N#K;0#5+-MGlHg&c3tH;DHkoijQpWC6N7ll=6}rO)28C%n zwt|=HYO8fTKXkMUBVw?DkH-jj1&m!s@on2klQ%(mzu$Oc6Wj!@gNL|CVS6IX4vR&0 zST392fCk5a!8}x^=f)M$N8fPyG6w9S<)NM9Y}-#J=!i=Kvv+w?;8MUM&=t6K4$S9b zz+%v@Qd>S4uzf!&v@J@6PTDBYRA2${od~om4!hzw(`Fd-hCE`!p&eLFI$Kl$aHf4= z(Bx*3{dC$0WQH{ioLc}jv-Elc+J^H(CJ+{f&GSlNq(qJBA}0@F9IrA)Lo5Il)n3FB zhpY484KabsB-fdZCsf%w*>l*U$0{LadUY$2(LU*?bj9gz0&elZS`l@Kc}mHTNh_k( z(`KpoF?ku+eM7J31g41WRDC*jQ{fJ)gL^~Q;A51UUli~==K`Oa3uNuvEL=YG{+m=# zNlrZgXeA@&z8FOFpOE`X*T(OSy-V3YeXWfv`xl_SGe%Ar2BN5NO+m*2xBxW`a09qS zx+F97OnPP@Cm=Zi+yK(hCO3c^Bn5R6)+0OyY)LC?*Rs){)Q)-HS?@}JZIaC_7+|!u~T5q4Ogm@JWC!4$gEu(c_B3L8v4u&N8 zK})zx;nzmBsTL>b&)$NTZOlfLYYuT8=|k*lEM=S3m4I8KzB2Z6I|p6E2sY8MNQ-N; z+QH$0^i^LHIJqnKv*u~SRAcNaQ)CDkB6uGlCtBs6T4M`Z&fY8o+Z&BA2O32Nkf-Fg z+-!3cI067fWiu(QI}B1#3CG1`O9rd>qH4_?=9g8m4lj-NtAr z%C~P$z}Lb6zX5zL9^m9>$vFj#0j>qi3tYMN8Rc|)Ba&wh9vbA21WOi-#;5&c=aWHV z12e)pM^-bU~#2mkGMK1cW#6VYVtw{-+(lxenQA#sG~u2V-D zp%2M?L2(xV3KfxxD#E5pLH~bzv$965b;!sjJ;X{Gkrs`H>U#0y)#-W`V>B2k&y`St z2FQCstP4O6I=S@qm;i&c)^y!bDNucE1c%z~_Zz|KIY zfCKD#O#MBKwd0DC0Cb9<{H zQr|@hgF@_}H4PEe=Y9DAx&>gKzbUnKIT{fZ6qMFK_AVaEZMBPicg~$`16BPk{=FVLy7Qcb;0w3|gVUU2H&#W>7N~Pg#8*qv=Wv z0F`{`?O%K?R-zh1$S(Zx=QBh1J{!UfRa{Lmm|@6gDdTI~*$ZV41PQnT)3LaW9&{dG{#7zLqV0}c^b$12cQQ8snI}8z&CtFD?q4!PL-ZAjlcz<;|+;&G^M?8 zdW1S7xuyOE>LIMLI{h(Gjk-!l)azb)nBG-01g8-)#&Tat+=u7!A_~|q=;A)(MTJ~fB z1#JD43&ixWK*O$K1{1J`CMeW!rBf0^6>AZQEqRb!J>!dd5P13dCP`ykWDQS|TcLo` zH*yGr`evYR6cs@sa$}2Xqb4*27>z0>QtSNzsLBLo)Reqn$eY)Ew5V-O^l1%#&k zh)xQ4hIFX~6oHO?K(p=^m3l9rc~7!ND`=AGkVi6MRWCIGKmc~F9w&hy3a{t^kU~o& z6t~J1=02Cr~>(kPB$IfW}q|Ol*zNP)e*!j4|$qGiDuUmN!4UGX-BX zhPc8v&-dQE`M#Nb&5(oc!8MN^*(p2zhGBFO=Xc*LY0DN^vnfy$vF270Q4{==ES-{$ z$?nBJu6^hnMx>dqvzBpvk)s~k?9rxNH<}BGFqwEEg|IKtrp{WZ9%0q=xRhkrphgJd`Gg_2LzXV2F8tsA)A{2{0E!w%MrX1VV!)U8|FxCF2 zw!E{f3F9IJ2m?^0R3c^C@h#W%klkE{x>_!6Q2zWRSJIG$RYE0FWcb>nyp4UNq3TnL z36X@JEyLreYn;;yCY8@^i0;$z# zT`xVju_LAcUkJa_DkBV{usLiA|Cy($v$HCSY1YMX+>1I7O=m|k?Lx%A7q)~fb!0&5 z*bk(S*n_k{DQJECOp_UYWF-W*HYT-H6N#iG%`#8mr62;G959*H!`<02uM zFlqK+5ns%hZ(m1P*HYj!vYIQpyRoUw>|*CM@>`5a3;B)(P_2!&i(S{bH_jGPWc6?t z&G3V70ouD_odkj)y7&e72iRFkqBYpqf#-o-qfG z!jb^Jlv8b@eOuZ<0T{wg_Rp6#CD=Jc7A8Xs(l*1$h^8D8Dh#pbc5@3WKsmymz^+WM zYm#z$7Ba!`1!K{H%Hj>tE?OH!jmTKq2{n2l4Uh;Oz}frz_d{hC!~o`{YD8O|egh#C zhS(UeHusLk%4=hi(gEuz<$K|1iYiA@L|Y*_xkv>c4vSMvJl=RM-RQL-6|$61NjgX& zia7kd3mcgRlLYGA8PQ8JBZ9NWF`$unz{3nDxad;G-!a;u z3pjJ1K5m?s=1wCTggt-VDUUQE1;bnc7V*UUm^#sOHHXkv&vz8P%BZ=>q4R!W=>YNr z87dkw8=)wor_@BpMtfB`(Yb1nId~Mk_qvs#b%S)?tN}pIyEzo*38Z^IWJEh_C?$Ik zS Date: Fri, 18 Aug 2017 12:42:48 +0200 Subject: [PATCH 33/50] hidden tab wux --- pandora_console/operation/agentes/ver_agente.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index 75d090485f..d731d332b6 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -1047,10 +1047,13 @@ $ux_console_tab = enterprise_hook('ux_console_tab'); if ($ux_console_tab == -1) $ux_console_tab = ""; -/* UX Console */ -$wux_console_tab = enterprise_hook('wux_console_tab'); -if ($wux_console_tab == -1) - $wux_console_tab = ""; +/* WUX Console */ +$modules_wux = enterprise_hook('get_wux_modules' , array($id_agente)); +if($modules_wux){ + $wux_console_tab = enterprise_hook('wux_console_tab'); + if ($wux_console_tab == -1) + $wux_console_tab = ""; +} /* GIS tab */ $gistab=""; From 86125a3c40cee8ea91c258c7edd3b0ed5c01ce49 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 18 Aug 2017 13:29:07 +0200 Subject: [PATCH 34/50] changes visual console wux --- pandora_console/images/reloj.png | Bin 0 -> 2361 bytes pandora_console/images/search_big.png | Bin 0 -> 2213 bytes pandora_console/images/wux.png | Bin 0 -> 518 bytes .../include/graphs/flot/pandora.flot.js | 1 + pandora_console/include/styles/pandora.css | 2 +- 5 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 pandora_console/images/reloj.png create mode 100644 pandora_console/images/search_big.png create mode 100644 pandora_console/images/wux.png diff --git a/pandora_console/images/reloj.png b/pandora_console/images/reloj.png new file mode 100644 index 0000000000000000000000000000000000000000..8dea142a7eaae947387323b242ee27563f9e0c19 GIT binary patch literal 2361 zcmV-93C8w`P)9_JO~3rNL0Mj~t^!km0O78t^U51Zlj zL`2*~SnvVydmKs&Q6dzUI!Fl?X!wI1BnZ^^0X=BZb5K8!Dj+rNf%-td7>Ni9Tsbum7$h6WDXjhz>9|Co1q+BN zs2Y$m&jX+)MMBAqm_jN6UqJ;m3~RxLt_MAv&&OpuRO5VnWj0Vv0aZ&rBt8AaGz3Wn zfylwdgzN=MYFVVDHy_!>{nXANOti{*q!^rtl)T9Op(C&XWrME31dIS9phy-vjGa13(@Ky}KW%c2FY(>|rUHnhbWLZ)KO0|OFcHI| zpb6Z4g7wc9ADs+ZAvTVVi2hW*-%>Bs?r5`|wVXl>#&B#jfC)Av%AbesBqPO zG>Tny=c~XDJlF&-g@2I|0fJPuK_vh_u#)ZPvQD0EoEj2vX{S**c9zl>03QTi35gGW zd|a@Hv{o&O{OgzOdb}B7;1m+jw~5w2k*3?_He3tnCX_af2%&p7DZq4~6+}C*1v}6Rq7}pvOa+#psX#l>63z;=gyb?f*c_|pily2k~|aPttLfvv5BK$PQnL`kuRlNGc!usngv;Mt9Hh^i~A zMqx^A3>=|YY_-A+M@?@AognZtOSj%m3IY=KHDZu;Zo2a5)S0uhz-z;yuQ|XlDa}ql zfac;SHH`M#DgZrk+Z^p15u#nIZv;N3vv%zX!3NNF`7F8 zZk@GCg-C7vwS{d?g2wTjB0q)fC<%}8gLPG3ChpEr5`JnrQ6y)>q$j^VOo`1m!}hsevg zf&NT^#^tl;d`UU4<2{mHs?gOL8hYr0> z-T?Jy=in?Wuo6*7s+v+Bk9CoS@SGudwwFkQ z!3A_w9dlgacfRuTcZ$C%=!#S$jmq#?mtJJ*n%1-m)-7Y^HqNc@QM7enWR=@0r!3I^ zfcKD|lkeg39>dfAiG2&u-nAaJ4FuskPYMtn*cHUC0J(zT3a~3k2|xve4%9)M3K%Lt z9YiI#gv@5vpfS?k?%kg5WN8Qfcx)tn{`PhIVE&n9mRVAH7R4B~#6V?jWW5+&UJM#d zREKLu1vEyA;PUT{e`}ntK%4`K^owSfPZmJ8fPKhRtH~j#tbs;wAu$V`0BG>{?cz0a zp$)faYSw|*12eOW0lIcW9+ml0U>;+rGoBUiJW=Z<<8dTLPg`L16)w2Nj z%5%U@4`@Lm-XKG=hyYsmzeWvQ#|GR6+~6xC1XE!Hp*3F?ECu}iN2bHx`VhuOG81Y5 zGeA(Cf?)a?@fZ9}7)iLsLevX=Ok_{z|&M(;sDqn%n3 zOx~D@2%5z{W*6suh+?2Igxfo8^2tm~C?9l3b?o`}hE-E6q~Q?(wGs5E575+s(36>{ zIAZp)ZyjCVAWrFsl^Zi{IZ6rI$7l-ZH#3WPq0Hh69{Rlf=69^V%r32_g0(RNT`}Hs zhndH|B#v$-%b68 zgcFH<$rbkiza2Roq)As_>u!q-R%$w4Jd>FeOozjt%|J|l_Q@|?jolQhRS)+wVLI8g z?kGTzpLIDys%?4SwUvJ4OfUM9HGEb|lf$-$F$%Cj-T#>}z0>zF%3IDM0`8>3qj4WH z9n2Mq*0Wp13xfAvUCYravqs7uhmr1vB14;NVK=kVzmsfMu%6%aE5nnI4sd3xftTin zj0m7ryW@B+R|VqbsPftRvf$( zeC(Ijim4d8i+#==+TeqOf#O0ft>hq6!C~JT-sa!Fd)R5$L~Udil?eLMIni%0kB9o6mn&6pO9E)ITXVirHLs88zTM2IsQ(H3C{s fu&HO3SrW)UTUm`|JNSEK00000NkvXXu0mjfr{qLc literal 0 HcmV?d00001 diff --git a/pandora_console/images/search_big.png b/pandora_console/images/search_big.png new file mode 100644 index 0000000000000000000000000000000000000000..30ae08a625dbbd2cef0670e44de1f58e958a909e GIT binary patch literal 2213 zcmV;W2wL}vP)9axStaCPEsZCKr;O5&!~-B!uo^P-uXHFcIjC1-N1u<|zZH zTj%2pDI94>09~8~UyuR$3`D0JoNh)6TSKgA9g7D+8ZO}S2Xc-A<)Zm$ZvIbhIuRr` zjW8hFN)!MHAo`^xVlojFOaOYPkko|wA4^!ETWo-oy$=A@ITBqsA{z=yuR!WOHVcs) zvH>U_NH7JWxzGXGU_3qxAS!vIC6NPok`2hB0;0nl>eBuA!W&5~$VUQ%)H0HhQV3-R z{7Df@*kcVQYz{%TgpnGV1*xoMAe5A;1^@zR=pjZt;RnhT>yd;W0K-p_Y=fa~ih5F$ z8r~cUO-jgyHbM;%BsJ|b;&5po(7+AEG(CuMG0ad$T!!K)0WkmzdO?Gn+t4%$0_8rS z*Peu2+z+J_@wnzaC9Q=8#FQZ<8%#urc7QB{fi7B4t-=ImupqW72)QAJmKq$0G8h)y z*dh(q=t2Yg(IcCpCIV1i0Z83P6Ba~v7%qbaNKIBSm!qdBa#~D{K>PtI?ZdzYpy7rT z*MB&Ih4^+XDg7am`bFe414zz!lob4f9{>bk&)RMngkfOA28_}T7@^&uY|xPyp__D+ zW(0^7q$stGU$jBO;xkH4$@zRX=l6Hpf}}*!wn2D?$nLm+F0FklSrrsu<8pAXHR&GU zCAtq*B#YW=_vAEeBqwv_d=_ngB-Wz0T zwReyd7A<(Hs=9$@%G!wayui4H6IU*`gZ5c>jA;Qsy16{XEq=X5IfrGaPwxWSD4Wx;4l(KgRxY7*F~+9IY4=7vCEeIfClCgGj~dR^sZ(uGxc z`0>aAu4i~u>6Sj{o>zifrXOg@Xp{3JF~M-H0CSh(=^Np9j*08u{GCYwokt$7jYG8V z-7<~mvp-^4z_Z9xjqurM-IXP1f7{Sula}&m-A)*WBG4iNLj&qD!t?|O*?;cfOK;Ge z%*qYP)7n*Hu>EGcn+ zes59)fO;^gOhRQ_-*yPcJ(iYbQmD?PwzFBe#r3eeVqm2JESV4aK*UU4jfch_h_Y^w zB*68*Bc>|lVg$byFgi1n#<+w}KMVz0Dhg?2v6Qi(v$~{Es)A}%pO&07UfH-;{CU_6 zohNQ*PLy^{Ae#W^=yO)s{BX%WBDz*N^0glYXs0ecNJ33D%sT+^LP(@mUFcoB`AK9; zl4WNE3{kEwizKCUA{_c}_MNXWs&}cP&N<13~nl0_XrcfC>T? zfE{23mzxG}eOz$+rUC8+c0o#M z%Iy@;NCU?};8qFH%phh!blF6npD zBJtrJnO4KKto%a!KC80$m~+yv(KZ{%2O`LOylHMl0Q}#XQWSy@<;h`f>mWcIw>r}e z5#*)NnwLbd55`{bI1dH1P3v;kEsUn&Qh41<;<$v&VYdVUS~6~-<)VvTms1}v0dy|- z9a>(P=ykQDe%w6xlyCzVbj2lQOLU_X2WKk?bz}}(?U?{}YUE1!HWViVx!k50>d6Dn zK(3;Yn@t;7AS{>JF%UM<4jt4{hl|#b+t~oD!tmPERClkvo73c7X5DV~v^S5>WC6vJ=n@UJa7TU}S#U6DBR)2z9>J!6?qe zC|N(0EX%F4V5YrJPR@|iDw3mFmJ0woLSUucdey`Qcft!bbyTHE0Q^UVyVg9Fx@wiyP8xNzs@z{Y@vHby{Xp%ESSG%FuFJsk^)$$pNC?QSOSJZAn1oh4G=GY zvgc!jD>jcHM;$1#LE-ow7O!YdgNX?;0d;) z@k~85CKRD5QxKX4aK{Wqu>%lbG(n6+CV}_Rr27GH>VpCnA`K`6;&>olNQ^~{SPTWF zJAY8j0kJ+b>d?UkAifAv4#XRQhEBkhl|h9}0#drXPejNlLTQl28$g8I{JfUtq)&Ir|Bet`~p?7!nox$PoZ7gX*E)gNbc`mU8EDMHDl-p$ZBLKY;saznLz#ta?&ZNfH8o2xsZ^007bc|P;YH!LI3~&07*qo IM6N<$f@@;H@c;k- literal 0 HcmV?d00001 diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js index d59d72ec4c..aad3c8ddde 100644 --- a/pandora_console/include/graphs/flot/pandora.flot.js +++ b/pandora_console/include/graphs/flot/pandora.flot.js @@ -558,6 +558,7 @@ function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors, options.grid.borderWidth = 0; options.grid.markings = [ { xaxis: { from: -0.25, to: -0.25 }, color: "#000" }, { yaxis: { from: 0, to: 0 }, color: "#000" }]; + options.grid.markingsLineWidth = 0.3; options.xaxis.tickLength = 0; options.yaxis.tickLength = 0; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index ed324d4be1..03182bb267 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -4256,7 +4256,7 @@ div#footer_help{ } .wux_global_result_content_right ul li p{ - margin-top: 40px; + margin-top: 36px; margin-right: 10px; margin-left: 10px; } From 0408a2bee6b487f33ee880300ecb2874171ffdfe Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 21 Aug 2017 13:53:50 +0200 Subject: [PATCH 35/50] resize pie graph --- .../include/graphs/flot/pandora.flot.js | 41 ++++++++++++++++++- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js index aad3c8ddde..1d5cfe749a 100644 --- a/pandora_console/include/graphs/flot/pandora.flot.js +++ b/pandora_console/include/graphs/flot/pandora.flot.js @@ -210,8 +210,8 @@ function pandoraFlotPieCustom(graph_id, values, labels, width, $('.legend>div').css('right',($('.legend>div').height()*-1)); $('.legend>table').css('right',($('.legend>div').height()*-1)); } - $('.legend>table').css('border',"1px solid #E2E2E2"); - $('.legend>table').css('background-color',"#FFF"); + //$('.legend>table').css('border',"1px solid #E2E2E2"); + $('.legend>table').css('background-color',"transparent"); var pielegends = $('#'+graph_id+' .pieLabelBackground'); @@ -269,6 +269,43 @@ function pandoraFlotPieCustom(graph_id, values, labels, width, set_watermark(graph_id, plot, $('#watermark_image_' + graph_id).attr('src')); } + + window.onresize = function(event) { + $.plot($('#' + graph_id), data, conf_pie); + if (no_data == data.length) { + $('#'+graph_id+' .overlay').remove(); + $('#'+graph_id+' .base').remove(); + $('#'+graph_id).prepend(""); + } + var legends = $('#'+graph_id+' .legendLabel'); + var j = 0; + legends.each(function () { + //$(this).css('width', $(this).width()); + $(this).css('font-size', font_size+'pt'); + $(this).removeClass("legendLabel"); + $(this).addClass(font); + $(this).text(legend[j]); + j++; + }); + + if ($('input[name="custom_graph"]').val()) { + $('.legend>div').css('right',($('.legend>div').height()*-1)); + $('.legend>table').css('right',($('.legend>div').height()*-1)); + } + //$('.legend>table').css('border',"1px solid #E2E2E2"); + $('.legend>table').css('background-color',"transparent"); + + + var pielegends = $('#'+graph_id+' .pieLabelBackground'); + pielegends.each(function () { + $(this).css('transform', "rotate(-35deg)").css('color', 'black'); + }); + var labelpielegends = $('#'+graph_id+' .pieLabel'); + labelpielegends.each(function () { + $(this).css('transform', "rotate(-35deg)").css('color', 'black'); + }); + } + } function pandoraFlotHBars(graph_id, values, labels, water_mark, From d4b0fc0e6b0e009d6f72a28975ad7e84a1868a32 Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 22 Aug 2017 11:12:20 +0200 Subject: [PATCH 36/50] fixed errors in wux --- pandora_console/images/icono-wux.png | Bin 0 -> 503 bytes pandora_console/images/module-wux.png | Bin 0 -> 500 bytes pandora_console/images/unknown.png | Bin 0 -> 2066 bytes pandora_console/include/functions_servers.php | 8 ++++++++ 4 files changed, 8 insertions(+) create mode 100644 pandora_console/images/icono-wux.png create mode 100644 pandora_console/images/module-wux.png create mode 100644 pandora_console/images/unknown.png diff --git a/pandora_console/images/icono-wux.png b/pandora_console/images/icono-wux.png new file mode 100644 index 0000000000000000000000000000000000000000..e48c08b8b2e566092c4e6536543ff581c3e67346 GIT binary patch literal 503 zcmVOS$5Cd*y z$kG4-1QR%qjSbg^VFNY*5I|TFGt`KF1qFp2KrHa^;lrIw*iN5O07g+5qKWfXXwF#HLe_C7=jdfXmCs005-ir(|k*n{faD002ovPDHLkV1n^Lz0m*w literal 0 HcmV?d00001 diff --git a/pandora_console/images/module-wux.png b/pandora_console/images/module-wux.png new file mode 100644 index 0000000000000000000000000000000000000000..3afc4e315201ebc88efd5d9b8292eece13649751 GIT binary patch literal 500 zcmV zP!UKPs}g_!VuZ;e3m!apkdX;lprWFJfgk_~AgqWHo2^XP%w@#u1p@wKU;qdpm`4JD zlmQ-f4}hLqzyjs0N0wQ!Vg*A)Lk8CpE|=F$g1ya9*>a42>_VjsX)Jfft0v}^(@ qR|AlQ>XF!uNbCtfmwjNM2LJ%CYMok+I+YOs0000s5u z=$n>^@iVbrW2D4TEC6T1b^ucQap?jT1MbkGps=8TD4!swll}NKz={k|5lBSRHbBm0 z4#fI<>Xa$OC_9f_8Xlmc!5{!OkA+y(y1KdyNy*8?hPfjtwH*UF$&!)MG>$K=GZGQ= zxRU4spn-|_^a2FX&_j#_f?__9O28rg0T>*DBpD1e5R|_9sTzUgCO>q;na~VeU+sSJqn05Q4n{{ST02|&jelG9TL6?g&U*hos>lqx-NN<$af!Q|HY=+zO>@f+~A zVkk`x@7}$mc2Zf7-hW4L>GxA=1Nw*pl{~Q@Uq}~FYC5_jPoFwPt$JWS%^SJ6LY@MU zfUUpgFvuN^nLJ3XmGFU6R7w&QcU4FM%a<(!V=99}T#g3yTFz5yI%v`dHjhJL8I861 z&x9rcYJqK_#BfmMf;{m=WVej+t_6WXDWZUiiV9USAxQ&_(9xgw3jls9kBn06+lttr)jq7zR4s zyrnX!?V!o$Md@3C-d?n>*Grq(TrRS`tayK|^Hl5X5KV zL?3y~?Q;umPD}IqS-y~Lll@B0JdTrsmWQoO0Q&(5l=HQS09zyjW^O>7)outIXlZXO z8EE>qFGL1fQlVx(U!Xe(ju0H$qaL9sEPclp3lG4fiY1g_8i^87z#)1>1AaRk`i^D& z6mPI}NvnfEV?1R6Hciw1I?r=VvRAH+tvg2@CM#>^qGDit`)0bN5}@66dk#2^_-yRnCbp}TS1#oGqc#ZGEFkSVsHY$>hXAupjQ+>*fb3bP_;zq zrSd}Kr)}9(ARB1C#BpVv9JJ2qs|5XJ{8s=eRV#I^I{{*tzNWar>we#B4z5a~gZ`uf z&0Y3%ck7hQH!iMBlSxt0xrh+f9Ffblg$^Rx)lq;&WLbvR(>4~E?$(Yv^T^IcMCDWR zDoXu~)zdahgM3Lv@mgedfJICl}~V@ zsU&kaO5fxerN@0VYJ&Z&@FEIR zgof87kRk*I6aekiZ+DGsRmym38pBO%VMfzlYyqOaER7smX0Bar88A}vn#^FEh9DWO zygVV|Rlgr9jEuSj|4LUc4)2D8wS$(_tRlybZCj~p_YY=p8zLb;;TBqA_K?d%@G zIfe&@VMCv2j*1r$DqFel8LviQfG^z@z2SD}m~}3ay;`mI7e|t1<1Dk3{|jz;G&a4v z;V_0MF*k|P4@r%pn8-dnk$w2GUjKAD9duGUoSp!0G-$Wm`?4s)$ZogeMlyPfkFsB= z221!D46B4Vt?m$r)AQMk1If7~NL1-vH}u^fPS`sHx-S6>{~|66=h4)F3`+K!B89W% z^eKsJRa&fT3Bi%_In-0Y>xH4jV($oBVu-ylt^U{CEBusBDxOO zzM&Xk?7%5%7b-JTE_R$2d67XW?cG0(^b07*qoM6N<$g2cAF __('Wux server'))); + $server["type"] = "wux"; + $id_modulo = 0; + break; default: $server["img"] = ''; $server["type"] = "unknown"; @@ -759,6 +764,9 @@ function servers_show_type ($id) { case 7: return html_print_image("images/server_web.png", true, array("title" => "Pandora FMS WEB server")); break; + case 8: + return html_print_image("images/module-wux.png", true, array("title" => "Pandora FMS WUX server")); + break; default: return "--"; break; From f5da86ac0aa968789fdcfa3a14dc714886c26cfb Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 22 Aug 2017 11:39:21 +0200 Subject: [PATCH 37/50] no apply policies in wux --- pandora_console/godmode/agentes/module_manager.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index acbf762210..78f97786c1 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -98,6 +98,9 @@ if (strstr($sec2, "enterprise/godmode/policies/policies") !== false) { //the modules to show in syntetic module policy form must be the policy //modules from the same policy. unset($modules['predictionserver']); + if (enterprise_installed()){ + unset($modules['webux']); + } } $show_creation = false; From c29d8a4fdb4b3e72de987d9691d3d7882584be0b Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 23 Aug 2017 09:35:17 +0200 Subject: [PATCH 38/50] Revert "merge develop" This reverts commit 823291171347bf74d93e74a99a3c958660a39fe2, reversing changes made to f5da86ac0aa968789fdcfa3a14dc714886c26cfb. --- pandora_agents/pc/AIX/pandora_agent.conf | 2 +- pandora_agents/pc/FreeBSD/pandora_agent.conf | 2 +- pandora_agents/pc/HP-UX/pandora_agent.conf | 2 +- pandora_agents/pc/Linux/pandora_agent.conf | 2 +- pandora_agents/pc/NT4/pandora_agent.conf | 2 +- pandora_agents/pc/SunOS/pandora_agent.conf | 2 +- pandora_agents/pc/Win32/pandora_agent.conf | 2 +- .../shellscript/aix/pandora_agent.conf | 2 +- .../shellscript/bsd-ipso/pandora_agent.conf | 2 +- .../shellscript/hp-ux/pandora_agent.conf | 2 +- .../shellscript/linux/pandora_agent.conf | 2 +- .../shellscript/mac_osx/pandora_agent.conf | 2 +- .../shellscript/openWRT/pandora_agent.conf | 2 +- .../shellscript/solaris/pandora_agent.conf | 2 +- pandora_agents/unix/AIX/pandora_agent.conf | 2 +- pandora_agents/unix/DEBIAN/control | 2 +- .../unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/Darwin/pandora_agent.conf | 2 +- .../unix/FreeBSD/pandora_agent.conf | 2 +- pandora_agents/unix/HP-UX/pandora_agent.conf | 2 +- pandora_agents/unix/Linux/pandora_agent.conf | 2 +- pandora_agents/unix/NT4/pandora_agent.conf | 8 +- pandora_agents/unix/NetBSD/pandora_agent.conf | 2 +- pandora_agents/unix/SunOS/pandora_agent.conf | 2 +- pandora_agents/unix/pandora_agent | 4 +- pandora_agents/unix/pandora_agent.redhat.spec | 4 +- pandora_agents/unix/pandora_agent.spec | 4 +- pandora_agents/unix/pandora_agent_installer | 4 +- pandora_agents/win32/bin/pandora_agent.conf | 2 +- pandora_agents/win32/installer/pandora.mpi | 4 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/extensions/insert_data.php | 1 - pandora_console/extras/mr/6.sql | 2 +- .../pandoradb_migrate_6.0_to_7.0.mysql.sql | 8 +- pandora_console/general/login_page.php | 24 +- .../godmode/agentes/agent_manager.php | 4 +- .../godmode/agentes/configurar_agente.php | 2 +- .../godmode/agentes/modificar_agente.php | 4 +- .../godmode/events/custom_events.php | 1 + .../godmode/massive/massive_edit_agents.php | 4 +- .../godmode/reporting/reporting_builder.php | 2 +- pandora_console/godmode/users/user_list.php | 23 +- pandora_console/include/ajax/module.php | 6 +- pandora_console/include/auth/mysql.php | 25 +- pandora_console/include/config_process.php | 4 +- pandora_console/include/functions.php | 2 +- pandora_console/include/functions_api.php | 65 ++-- pandora_console/include/functions_graph.php | 4 +- pandora_console/include/functions_modules.php | 2 +- .../include/functions_reporting.php | 21 +- .../include/functions_update_manager.php | 4 +- .../flot/jquery.flot.exportdata.pandora.js | 5 +- .../include/graphs/flot/pandora.flot.js | 12 +- .../include/graphs/functions_pchart.php | 278 ++-------------- .../include/help/en/help_alert_config.php | 1 - .../include/help/en/help_alert_macros.php | 1 - .../help/en/help_reports_label_field.php | 1 - .../include/help/es/help_alert_config.php | 3 +- .../include/help/es/help_alert_macros.php | 1 - .../help/es/help_reports_label_field.php | 1 - .../functions_pandora_networkmap.js | 107 +------ .../include/styles/pandora_black.css | 8 - pandora_console/install.php | 4 +- pandora_console/mobile/include/user.class.php | 5 +- pandora_console/operation/search_modules.php | 296 +++++++++--------- pandora_console/pandora_console.redhat.spec | 4 +- pandora_console/pandora_console.spec | 4 +- pandora_console/pandora_console_install | 2 +- pandora_console/pandoradb.sql | 2 +- pandora_console/pandoradb_data.sql | 3 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/conf/pandora_server.conf.new | 11 +- pandora_server/lib/PandoraFMS/Config.pm | 21 +- pandora_server/lib/PandoraFMS/Core.pm | 17 +- pandora_server/pandora_server.redhat.spec | 4 +- pandora_server/pandora_server.spec | 4 +- pandora_server/pandora_server_installer | 4 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 4 +- 83 files changed, 380 insertions(+), 721 deletions(-) diff --git a/pandora_agents/pc/AIX/pandora_agent.conf b/pandora_agents/pc/AIX/pandora_agent.conf index 9a9ee70cc1..de9e79aa1d 100644 --- a/pandora_agents/pc/AIX/pandora_agent.conf +++ b/pandora_agents/pc/AIX/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.711, AIX version +# Version 7.0NG.710, AIX version # Licensed under GPL license v2, # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/FreeBSD/pandora_agent.conf b/pandora_agents/pc/FreeBSD/pandora_agent.conf index c8dfd8ec7c..ee89a53dbb 100644 --- a/pandora_agents/pc/FreeBSD/pandora_agent.conf +++ b/pandora_agents/pc/FreeBSD/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.711, FreeBSD Version +# Version 7.0NG.710, FreeBSD Version # Licensed under GPL license v2, # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/HP-UX/pandora_agent.conf b/pandora_agents/pc/HP-UX/pandora_agent.conf index 4f5c2af550..5f5de4fa76 100644 --- a/pandora_agents/pc/HP-UX/pandora_agent.conf +++ b/pandora_agents/pc/HP-UX/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.711, HP-UX Version +# Version 7.0NG.710, HP-UX Version # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/Linux/pandora_agent.conf b/pandora_agents/pc/Linux/pandora_agent.conf index 5eacb171ef..5093e1effa 100644 --- a/pandora_agents/pc/Linux/pandora_agent.conf +++ b/pandora_agents/pc/Linux/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.711, GNU/Linux +# Version 7.0NG.710, GNU/Linux # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/NT4/pandora_agent.conf b/pandora_agents/pc/NT4/pandora_agent.conf index 67ab32afae..3afa73c7b0 100644 --- a/pandora_agents/pc/NT4/pandora_agent.conf +++ b/pandora_agents/pc/NT4/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.711, GNU/Linux +# Version 7.0NG.710, GNU/Linux # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/SunOS/pandora_agent.conf b/pandora_agents/pc/SunOS/pandora_agent.conf index 4eadf2a000..ef6d1fdef8 100644 --- a/pandora_agents/pc/SunOS/pandora_agent.conf +++ b/pandora_agents/pc/SunOS/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.711, Solaris Version +# Version 7.0NG.710, Solaris Version # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/pc/Win32/pandora_agent.conf b/pandora_agents/pc/Win32/pandora_agent.conf index b87cf062ab..fa941aa97b 100644 --- a/pandora_agents/pc/Win32/pandora_agent.conf +++ b/pandora_agents/pc/Win32/pandora_agent.conf @@ -1,6 +1,6 @@ # Base config file for Pandora FMS Windows Agent # (c) 2006-2010 Artica Soluciones Tecnologicas -# Version 7.0NG.711 +# Version 7.0NG.710 # This program is Free Software, you can redistribute it and/or modify it # under the terms of the GNU General Public Licence as published by the Free Software diff --git a/pandora_agents/shellscript/aix/pandora_agent.conf b/pandora_agents/shellscript/aix/pandora_agent.conf index c3f543ca85..07e7ad3da0 100644 --- a/pandora_agents/shellscript/aix/pandora_agent.conf +++ b/pandora_agents/shellscript/aix/pandora_agent.conf @@ -1,6 +1,6 @@ # Fichero de configuracion base de agentes de Pandora # Base config file for Pandora agents -# Version 7.0NG.711, AIX version +# Version 7.0NG.710, AIX version # General Parameters # ================== diff --git a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf index 09735b38c4..63f463a932 100644 --- a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf +++ b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf @@ -1,6 +1,6 @@ # Fichero de configuracion base de agentes de Pandora # Base config file for Pandora agents -# Version 7.0NG.711 +# Version 7.0NG.710 # FreeBSD/IPSO version # Licenced under GPL licence, 2003-2007 Sancho Lerena diff --git a/pandora_agents/shellscript/hp-ux/pandora_agent.conf b/pandora_agents/shellscript/hp-ux/pandora_agent.conf index f2bae011fb..20951ab529 100644 --- a/pandora_agents/shellscript/hp-ux/pandora_agent.conf +++ b/pandora_agents/shellscript/hp-ux/pandora_agent.conf @@ -1,6 +1,6 @@ # Fichero de configuracion base de agentes de Pandora # Base config file for Pandora agents -# Version 7.0NG.711, HPUX Version +# Version 7.0NG.710, HPUX Version # General Parameters # ================== diff --git a/pandora_agents/shellscript/linux/pandora_agent.conf b/pandora_agents/shellscript/linux/pandora_agent.conf index fb96e7e51f..3a2d4a3e4b 100644 --- a/pandora_agents/shellscript/linux/pandora_agent.conf +++ b/pandora_agents/shellscript/linux/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.711 +# Version 7.0NG.710 # Licensed under GPL license v2, # (c) 2003-2010 Artica Soluciones Tecnologicas # please visit http://pandora.sourceforge.net diff --git a/pandora_agents/shellscript/mac_osx/pandora_agent.conf b/pandora_agents/shellscript/mac_osx/pandora_agent.conf index 26d15d9caa..88b68a7a25 100644 --- a/pandora_agents/shellscript/mac_osx/pandora_agent.conf +++ b/pandora_agents/shellscript/mac_osx/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.711 +# Version 7.0NG.710 # Licensed under GPL license v2, # (c) 2003-2009 Artica Soluciones Tecnologicas # please visit http://pandora.sourceforge.net diff --git a/pandora_agents/shellscript/openWRT/pandora_agent.conf b/pandora_agents/shellscript/openWRT/pandora_agent.conf index 2aca85fb6d..54ece23c85 100644 --- a/pandora_agents/shellscript/openWRT/pandora_agent.conf +++ b/pandora_agents/shellscript/openWRT/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.711 +# Version 7.0NG.710 # Licensed under GPL license v2, # please visit http://pandora.sourceforge.net diff --git a/pandora_agents/shellscript/solaris/pandora_agent.conf b/pandora_agents/shellscript/solaris/pandora_agent.conf index 6e0bed9043..70cd00c95f 100644 --- a/pandora_agents/shellscript/solaris/pandora_agent.conf +++ b/pandora_agents/shellscript/solaris/pandora_agent.conf @@ -1,6 +1,6 @@ # Fichero de configuracion base de agentes de Pandora # Base config file for Pandora agents -# Version 7.0NG.711, Solaris version +# Version 7.0NG.710, Solaris version # General Parameters # ================== diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf index 61992db4e7..5c0c53125b 100644 --- a/pandora_agents/unix/AIX/pandora_agent.conf +++ b/pandora_agents/unix/AIX/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.711, AIX version +# Version 7.0NG.710, AIX version # Licensed under GPL license v2, # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 276b53722d..9aa3c81c5c 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.711-170822 +Version: 7.0NG.710-170816 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 0d1313a528..74b4f8c06f 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.711-170822" +pandora_version="7.0NG.710-170816" 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/Darwin/pandora_agent.conf b/pandora_agents/unix/Darwin/pandora_agent.conf index 81cf4fcbf2..be6d94e65a 100644 --- a/pandora_agents/unix/Darwin/pandora_agent.conf +++ b/pandora_agents/unix/Darwin/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.711, GNU/Linux +# Version 7.0NG.710, GNU/Linux # Licensed under GPL license v2, # Copyright (c) 2003-2012 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/FreeBSD/pandora_agent.conf b/pandora_agents/unix/FreeBSD/pandora_agent.conf index ad5aeac980..6862ed1ee6 100644 --- a/pandora_agents/unix/FreeBSD/pandora_agent.conf +++ b/pandora_agents/unix/FreeBSD/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.711, FreeBSD Version +# Version 7.0NG.710, FreeBSD Version # Licensed under GPL license v2, # Copyright (c) 2003-2016 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/HP-UX/pandora_agent.conf b/pandora_agents/unix/HP-UX/pandora_agent.conf index 58510d7c44..57c45b4df6 100644 --- a/pandora_agents/unix/HP-UX/pandora_agent.conf +++ b/pandora_agents/unix/HP-UX/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.711, HP-UX Version +# Version 7.0NG.710, HP-UX Version # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf index 7700b94902..842a51aad7 100644 --- a/pandora_agents/unix/Linux/pandora_agent.conf +++ b/pandora_agents/unix/Linux/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.711, GNU/Linux +# Version 7.0NG.710, GNU/Linux # Licensed under GPL license v2, # Copyright (c) 2003-2014 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/NT4/pandora_agent.conf b/pandora_agents/unix/NT4/pandora_agent.conf index 7fbad3a107..b8c11f135e 100644 --- a/pandora_agents/unix/NT4/pandora_agent.conf +++ b/pandora_agents/unix/NT4/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.711, GNU/Linux +# Version 7.0NG.710, GNU/Linux # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com @@ -41,9 +41,9 @@ udp_server_auth_address 0.0.0.0 # Group assigned for this agent (descriptive, p.e: Servers) #group Servers - -# Group password (if defined). -#group_password + +# Group password (if defined). +#group_password # Autotime: Enforce to server to ignore timestamp coming from this # agent, used when agents has no timer or it's inestable. 1 to enable diff --git a/pandora_agents/unix/NetBSD/pandora_agent.conf b/pandora_agents/unix/NetBSD/pandora_agent.conf index 06b26ab115..6c8eb8b422 100644 --- a/pandora_agents/unix/NetBSD/pandora_agent.conf +++ b/pandora_agents/unix/NetBSD/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.711, NetBSD Version +# Version 7.0NG.710, NetBSD Version # Licensed under GPL license v2, # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/SunOS/pandora_agent.conf b/pandora_agents/unix/SunOS/pandora_agent.conf index bb05f91af7..5a4f581471 100644 --- a/pandora_agents/unix/SunOS/pandora_agent.conf +++ b/pandora_agents/unix/SunOS/pandora_agent.conf @@ -1,5 +1,5 @@ # Base config file for Pandora FMS agents -# Version 7.0NG.711, Solaris Version +# Version 7.0NG.710, Solaris Version # Licensed under GPL license v2, # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # http://www.pandorafms.com diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index efa207b706..e3d4c20811 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -40,8 +40,8 @@ my $Sem = undef; # Semaphore used to control the number of threads my $ThreadSem = undef; -use constant AGENT_VERSION => '7.0NG.711'; -use constant AGENT_BUILD => '170822'; +use constant AGENT_VERSION => '7.0NG.710'; +use constant AGENT_BUILD => '170816'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index dd8c167378..60535b98da 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -2,8 +2,8 @@ #Pandora FMS Linux Agent # %define name pandorafms_agent_unix -%define version 7.0NG.711 -%define release 170822 +%define version 7.0NG.710 +%define release 170816 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 cf6884da99..9e7f3945a7 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -2,8 +2,8 @@ #Pandora FMS Linux Agent # %define name pandorafms_agent_unix -%define version 7.0NG.711 -%define release 170822 +%define version 7.0NG.710 +%define release 170816 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 d9c418c9f9..d086362b4a 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -9,8 +9,8 @@ # Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license. # ********************************************************************** -PI_VERSION="7.0NG.711" -PI_BUILD="170822" +PI_VERSION="7.0NG.710" +PI_BUILD="170816" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf index 9a57969482..ea387c7f6b 100644 --- a/pandora_agents/win32/bin/pandora_agent.conf +++ b/pandora_agents/win32/bin/pandora_agent.conf @@ -1,6 +1,6 @@ # Base config file for Pandora FMS Windows Agent # (c) 2006-2014 Artica Soluciones Tecnologicas -# Version 7.0NG.711 +# Version 7.0NG.710 # This program is Free Software, you can redistribute it and/or modify it # under the terms of the GNU General Public Licence as published by the Free Software diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 7e3ef3a708..46676655c9 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -3,7 +3,7 @@ AllowLanguageSelection {Yes} AppName -{Pandora FMS Windows Agent v7.0NG.711} +{Pandora FMS Windows Agent v7.0NG.710} ApplicationID {17E3D2CF-CA02-406B-8A80-9D31C17BD08F} @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{170809} +{170816} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index c70e82255d..e97638ef3a 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.711(Build 170822)") +#define PANDORA_VERSION ("7.0NG.710(Build 170816)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 22b4190737..9c35dd9120 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.711(Build 170822))" + VALUE "ProductVersion", "(7.0NG.710(Build 170816))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 9e192e3df3..697371d76e 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.711-170822 +Version: 7.0NG.710-170816 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 53befa0460..a88382467d 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.711-170822" +pandora_version="7.0NG.710-170816" package_pear=0 package_pandora=1 diff --git a/pandora_console/extensions/insert_data.php b/pandora_console/extensions/insert_data.php index 4466be067e..3e52a9138c 100644 --- a/pandora_console/extensions/insert_data.php +++ b/pandora_console/extensions/insert_data.php @@ -167,7 +167,6 @@ function mainInsertData() { $params['use_hidden_input_idagent'] = true; $params['print_hidden_input_idagent'] = true; $params['hidden_input_idagent_id'] = 'hidden-autocomplete_id_agent'; - $params['hidden_input_idagent_value'] = $id_agente; $table->data[0][1] = ui_print_agent_autocomplete_input($params); diff --git a/pandora_console/extras/mr/6.sql b/pandora_console/extras/mr/6.sql index 4449cff806..5e459a2622 100644 --- a/pandora_console/extras/mr/6.sql +++ b/pandora_console/extras/mr/6.sql @@ -1,6 +1,6 @@ START TRANSACTION; -ALTER TABLE tagente MODIFY COLUMN `cascade_protection_module` int(10) unsigned NOT NULL default '0'; +ALTER TABLE tagente MODIFY COLUMN cascade_protection_module int(10) unsigned NOT NULL default '0'; INSERT INTO tmodule VALUES (8, 'Wux module'); 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 30f99507de..8e716a14d0 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 @@ -1327,7 +1327,7 @@ IF @vv1>0 THEN END IF; END; // -delimiter ; +delimiter; CALL addcol(); DROP PROCEDURE addcol; @@ -1416,3 +1416,9 @@ ALTER TABLE tgraph_source ADD COLUMN id_server int(11) UNSIGNED NOT NULL default -- --------------------------------------------------------------------- ALTER TABLE tserver_export_data MODIFY `module_name` varchar(600) BINARY NOT NULL default ''; + +-- --------------------------------------------------------------------- +-- Table `tmodule` +-- --------------------------------------------------------------------- + +INSERT INTO tmodule VALUES (8, 'Wux module'); \ No newline at end of file diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php index 73a11a27b7..5e9278a854 100755 --- a/pandora_console/general/login_page.php +++ b/pandora_console/general/login_page.php @@ -170,22 +170,18 @@ echo '