From 88ac1c7e158a980b801b4bdbd67785d93accc036 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Mon, 13 Apr 2020 11:44:05 +0200 Subject: [PATCH 001/116] update spec version (server enterprise) --- extras/pandora_update_version.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/extras/pandora_update_version.sh b/extras/pandora_update_version.sh index 7382112db9..78629ff8c0 100755 --- a/extras/pandora_update_version.sh +++ b/extras/pandora_update_version.sh @@ -30,6 +30,7 @@ $CODEHOME/pandora_console/pandora_console.rhel7.spec \ $CODEHOME/pandora_agents/unix/pandora_agent.redhat.spec \ $CODEHOME/pandora_server/pandora_server.redhat.spec \ $PANDHOME_ENT/pandora_agents/pandora_agent.spec \ +$PANDHOME_ENT/pandora_server/pandora_server_enterprise.redhat.spec \ $PANDHOME_ENT/pandora_console/enterprise/pandora_console_enterprise.redhat.spec \ $PANDHOME_ENT/pandora_console/enterprise/pandora_console_enterprise.rhel7.spec \ $PANDHOME_ENT/pandora_server/PandoraFMS-Enterprise/pandora_server_enterprise.redhat.spec" From 99ffe53a4ab2f568a592cb282ecdeb9c400adc9d Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Mon, 20 Apr 2020 10:46:22 +0200 Subject: [PATCH 002/116] update version debian package (ent) --- extras/pandora_update_version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras/pandora_update_version.sh b/extras/pandora_update_version.sh index 78629ff8c0..5fa5af91f0 100755 --- a/extras/pandora_update_version.sh +++ b/extras/pandora_update_version.sh @@ -38,7 +38,7 @@ DEBIAN_FILES="$CODEHOME/pandora_console/DEBIAN \ $CODEHOME/pandora_server/DEBIAN \ $CODEHOME/pandora_agents/unix/DEBIAN \ $PANDHOME_ENT/pandora_console/DEBIAN \ -$PANDHOME_ENT/pandora_server/PandoraFMS-Enterprise/DEBIAN" +$PANDHOME_ENT/pandora_server/DEBIAN" INSTALLER_FILES="$CODEHOME/pandora_console/pandora_console_install \ $CODEHOME/pandora_server/pandora_server_installer \ $CODEHOME/pandora_agents/unix/pandora_agent_installer" From d6ac646046329e40edc7145ce0bf7de2d36df96b Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Tue, 21 Apr 2020 17:57:36 +0200 Subject: [PATCH 003/116] fixed bug: update owner_user when validating an event --- pandora_console/include/functions_events.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 7fad691c74..3e71596c36 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -612,12 +612,14 @@ function events_update_status($id_evento, $status, $filter=null, $history=false) 'UPDATE %s SET estado = %d, ack_utimestamp = %d, - id_usuario = "%s" + id_usuario = "%s", + owner_user = "%s" WHERE id_evento IN (%s)', $table, $status, time(), $config['id_user'], + $config['id_user'], join(',', $target_ids) ); } From 19f7280c86a245bc165016e50e5b3fafba77fded Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Wed, 22 Apr 2020 16:09:12 +0200 Subject: [PATCH 004/116] Cleanup old SEL GRID sessions --- pandora_server/conf/pandora_server.conf.new | 3 +++ pandora_server/lib/PandoraFMS/Config.pm | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new index 557b9f3a7d..bc3980ff5d 100644 --- a/pandora_server/conf/pandora_server.conf.new +++ b/pandora_server/conf/pandora_server.conf.new @@ -626,6 +626,9 @@ wuxserver 0 # Maximum timeout to connect to a target web site, also for communications with a Selenium Grid server. #wux_webagent_timeout 15 +# Force closing previous sessions on remote wux_host, only for Selenium Grid server 3. +#clean_wux_sessions 1 + # Enable (1) or disable (0) the Pandora FMS Syslog Server (PANDORA FMS ENTERPRISE ONLY). syslogserver 1 diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index ee0762e02e..266900d808 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -522,6 +522,7 @@ sub pandora_load_config { $pa_config->{"wux_port"} = 4444; # 7.0 $pa_config->{"wux_browser"} = "*firefox"; # 7.0 $pa_config->{"wux_webagent_timeout"} = 15; # 7.0 + $pa_config->{"clean_wux_sessions"} = 1; # 7.0.746 (only selenium 3) # Syslog Server $pa_config->{"syslogserver"} = 1; # 7.0.716 @@ -1205,6 +1206,9 @@ sub pandora_load_config { elsif ($parametro =~ m/^wux_webagent_timeout\s+([0-9]*)/i) { $pa_config->{'wux_webagent_timeout'}= clean_blank($1); } + elsif ($parametro =~ m/^clean_wux_sessions\s+([0-9]*)/i) { + $pa_config->{'clean_wux_sessions'}= clean_blank($1); + } elsif ($parametro =~ m/^syslogserver\s+([0-1])/i) { $pa_config->{'syslogserver'}= clean_blank($1); } From 750b8397a3630c15c1e572658ef2edf1d52075c9 Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Thu, 23 Apr 2020 12:35:52 +0200 Subject: [PATCH 005/116] fix bad route of background image --- pandora_console/include/functions_visual_map.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index 0cc7d1f8ac..24c07a6487 100755 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -3596,11 +3596,7 @@ function visual_map_print_visual_map( $proportion_width = ($mapWidth / $layout['width']); if ($layout['background'] != 'None.png') { - if (is_metaconsole()) { - $backgroundImage = '/include/Image/image_functions.php?getFile=1&thumb=1&thumb_size='.$mapWidth.'x'.$mapHeight.'&file='.$config['homeurl'].'images/console/background/'.$layout['background']; - } else { $backgroundImage = '/include/Image/image_functions.php?getFile=1&thumb=1&thumb_size='.$mapWidth.'x'.$mapHeight.'&file='.$config['homedir'].'/images/console/background/'.($layout['background']); - } } } else { $mapWidth = $layout['width']; From 086bc289868502f46ee8c8a779c35b802fc63c6b Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Mon, 27 Apr 2020 17:27:54 +0200 Subject: [PATCH 006/116] Changed target ip selector in WMI server policy modules --- .../agentes/module_manager_editor_wmi.php | 60 ++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/pandora_console/godmode/agentes/module_manager_editor_wmi.php b/pandora_console/godmode/agentes/module_manager_editor_wmi.php index 09501c358b..9a85c3c19d 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_wmi.php +++ b/pandora_console/godmode/agentes/module_manager_editor_wmi.php @@ -43,7 +43,47 @@ if (empty($update_module_id)) { $data = []; $data[0] = __('Target IP').' '.ui_print_help_icon('wmi_module_tab', true); -$data[1] = html_print_input_text('ip_target', $ip_target, '', 15, 60, true); + +if ($page == 'enterprise/godmode/policies/policy_modules') { + if ($ip_target != 'auto' && $ip_target != '') { + $custom_ip_target = $ip_target; + $ip_target = 'custom'; + } else if ($ip_target == '') { + $ip_target = 'force_pri'; + $custom_ip_target = ''; + } else { + $custom_ip_target = ''; + } + + $target_ip_values = []; + $target_ip_values['auto'] = __('Auto'); + $target_ip_values['force_pri'] = __('Force primary key'); + $target_ip_values['custom'] = __('Custom'); + + $data[1] = html_print_select( + $target_ip_values, + 'ip_target', + $ip_target, + '', + '', + '', + true, + false, + false, + '', + false, + 'width:200px;' + ); + + $data[1] .= html_print_input_text('custom_ip_target', $custom_ip_target, '', 15, 60, true); +} else { + if ($ip_target == 'auto') { + $ip_target = agents_get_address($id_agente); + } + + $data[1] = html_print_input_text('ip_target', $ip_target, '', 15, 60, true); +} + $data[2] = __('Namespace').ui_print_help_tip(__('Optional. WMI namespace. If unsure leave blank.'), true); $data[3] = html_print_input_text( 'tcp_send', @@ -136,3 +176,21 @@ $data[3] = html_print_input_text( ); push_table_simple($data, 'key_field'); +?> + From 06ae3a61e8813c60f6b12e970c7a3d727ed56ef3 Mon Sep 17 00:00:00 2001 From: Junichi Satoh Date: Thu, 30 Apr 2020 15:39:32 +0900 Subject: [PATCH 007/116] Fixed widget title corruption in dashboard with multi-byte characters. --- pandora_console/include/lib/Dashboard/Cell.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/lib/Dashboard/Cell.php b/pandora_console/include/lib/Dashboard/Cell.php index df93bbdfec..fdc6b3366d 100644 --- a/pandora_console/include/lib/Dashboard/Cell.php +++ b/pandora_console/include/lib/Dashboard/Cell.php @@ -156,7 +156,7 @@ class Cell // Options for widget. if (empty($options) !== true) { - $options = json_encode($options); + $options = json_encode($options, JSON_UNESCAPED_UNICODE); } else { $options = $this->fieldsCell['options']; } From 788c39008e1c15929bf2287cbfe980b63affbc92 Mon Sep 17 00:00:00 2001 From: Junichi Satoh Date: Thu, 30 Apr 2020 15:50:45 +0900 Subject: [PATCH 008/116] Fixed the problem that agent cannot be enabled/disabled with open version. --- pandora_console/godmode/agentes/modificar_agente.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index 244e1d8618..ffb00a83ef 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -122,7 +122,7 @@ if ($enable_agent) { enterprise_include_once('include/functions_agents.php'); $values = ['disabled' => 0]; enterprise_hook('agent_update_from_cache', [$enable_agent, $values, $server_name]); - config_agents_update_config_token($enable_agent, 'standby', 0); + enterprise_hook('config_agents_update_config_token', [$enable_agent, 'standby', 0]); db_pandora_audit('Agent management', 'Enable '.$alias); } else { db_pandora_audit('Agent management', 'Fail to enable '.$alias); @@ -144,7 +144,7 @@ if ($disable_agent) { enterprise_include_once('include/functions_agents.php'); $values = ['disabled' => 1]; enterprise_hook('agent_update_from_cache', [$disable_agent, $values, $server_name]); - config_agents_update_config_token($disable_agent, 'standby', 1); + enterprise_hook('config_agents_update_config_token', [$disable_agent, 'standby', 1]); db_pandora_audit('Agent management', 'Disable '.$alias); } else { From 64493fc9fa9329157fd89a81add3aaf827a489b2 Mon Sep 17 00:00:00 2001 From: Junichi Satoh Date: Thu, 30 Apr 2020 16:00:33 +0900 Subject: [PATCH 009/116] Modified nfdump's arguments order. The 'filters' should be last with some nfdump binary. --- pandora_console/include/functions_netflow.php | 39 ++++++++----------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php index 3d44f1ef7f..01bdb56548 100644 --- a/pandora_console/include/functions_netflow.php +++ b/pandora_console/include/functions_netflow.php @@ -606,10 +606,10 @@ function netflow_get_stats( } // Get the command to call nfdump. - $command = netflow_get_command($filter); + $options = "-o csv -q -n $max -s $aggregate/bytes -t ".date($nfdump_date_format, $start_date).'-'.date($nfdump_date_format, $end_date); + $command = netflow_get_command($options, $filter); // Execute nfdump. - $command .= " -o csv -q -n $max -s $aggregate/bytes -t ".date($nfdump_date_format, $start_date).'-'.date($nfdump_date_format, $end_date); exec($command, $string); if (! is_array($string)) { @@ -694,10 +694,10 @@ function netflow_get_summary($start_date, $end_date, $filter, $connection_name=' } // Get the command to call nfdump. - $command = netflow_get_command($filter); + $options = '-o csv -n 1 -s srcip/bytes -t '.date($nfdump_date_format, $start_date).'-'.date($nfdump_date_format, $end_date); + $command = netflow_get_command($options, $filter); // Execute nfdump. - $command .= ' -o csv -n 1 -s srcip/bytes -t '.date($nfdump_date_format, $start_date).'-'.date($nfdump_date_format, $end_date); exec($command, $string); if (! is_array($string) || ! isset($string[5])) { @@ -765,20 +765,11 @@ function netflow_get_relationships_raw_data( ); // Get the command to call nfdump. - $command = sprintf( - '%s -q -o csv -n %s -s %s/bytes -t %s-%s', - netflow_get_command($filter), - NETFLOW_MAX_DATA_CIRCULAR_MESH, - 'record', - date($nfdump_date_format, $start_date), - date($nfdump_date_format, $end_date) - ); - - // Get the command to call nfdump. - $command = netflow_get_command($filter); + $options = ' -q -o csv -n 10000 -s record/bytes -t '.date($nfdump_date_format, $start_date).'-'.date($nfdump_date_format, $end_date); + $command = netflow_get_command($options, $filter); // Execute nfdump. - $command .= ' -q -o csv -n 10000 -s record/bytes -t '.date($nfdump_date_format, $start_date).'-'.date($nfdump_date_format, $end_date); + #$command .= ' -q -o csv -n 10000 -s record/bytes -t '.date($nfdump_date_format, $start_date).'-'.date($nfdump_date_format, $end_date); exec($command, $result); if (! is_array($result)) { @@ -877,7 +868,7 @@ function netflow_parse_relationships_for_circular_mesh( * * @return string Command to run. */ -function netflow_get_command($filter) +function netflow_get_command($options, $filter) { global $config; @@ -889,6 +880,9 @@ function netflow_get_command($filter) $command .= ' -R. -M '.$config['netflow_path']; } + // Add options. + $command .= ' '.$options; + // Filter options. $command .= ' '.netflow_get_filter_arguments($filter); @@ -1498,8 +1492,6 @@ function netflow_get_top_summary( return []; } - $command = netflow_get_command($netflow_filter); - // Execute nfdump. $order_text = ''; switch ($order) { @@ -1517,7 +1509,8 @@ function netflow_get_top_summary( break; } - $command .= " -q -o csv -n $max -s $sort/$order_text -t ".date($nfdump_date_format, $start_date).'-'.date($nfdump_date_format, $end_date); + $options = "-q -o csv -n $max -s $sort/$order_text -t ".date($nfdump_date_format, $start_date).'-'.date($nfdump_date_format, $end_date); + $command = netflow_get_command($options, $netflow_filter); exec($command, $result); if (! is_array($result)) { @@ -1671,14 +1664,14 @@ function netflow_get_top_data( ]; // Get the command to call nfdump. - $agg_command = sprintf( - '%s -q -o csv -n %s -s %s/bytes -t %s-%s', - io_safe_output(netflow_get_command($filter)), + $options = sprintf( + '-q -o csv -n %s -s %s/bytes -t %s-%s', $max, $aggregate, date($nfdump_date_format, $start_date), date($nfdump_date_format, $end_date) ); + $agg_command = netflow_get_command($options, $filter); // Call nfdump. exec($agg_command, $string); From 4f52a693ac993c0fea9cb9398bde7a639f069daf Mon Sep 17 00:00:00 2001 From: Luis Calvo Date: Wed, 13 May 2020 14:37:20 +0200 Subject: [PATCH 010/116] CSV flot export fixes --- .../flot/jquery.flot.exportdata.pandora.js | 623 +++++++++--------- 1 file changed, 316 insertions(+), 307 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 0b745d8ff5..6466a72835 100644 --- a/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js +++ b/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js @@ -1,227 +1,19 @@ (function ($) { var options = { - export: { - export_data: false, // or true - labels_long: null, - homeurl: '' - } - }; - + export: { + export_data: false, // or true + labels_long: null, + homeurl: "", + }, + }; + function init(plot) { plot.exportDataCSV = function (args) { //amount = plot.getOptions().export.type, //options = options || {}; // Options - var type = 'csv'; - type = type.toLowerCase().trim(); - - var graphData, - dataObject, - dataObjects = plot.getData(), - result = []; - - // Throw errors - var retrieveDataOject = function (dataObjects, custom) { - var result; - if (typeof dataObjects === 'undefined') - throw new Error('Empty parameter'); - - // Try to retrieve the avg set (not 100% reliable, I know) - if (dataObjects.length == 1) { - result = dataObjects.shift(); - } - if (dataObjects.length > 1) { - dataObjects.forEach(function (element) { - if(custom){ - if (/^Avg.:/i.test(element.label)){ - result = element; - } - } else { - result = element; - } - }); - - // If the avg set is missing, retrieve the first set - if (typeof result === 'undefined') - result = dataObjects.shift(); - } - - if (typeof result === 'undefined') - throw new Error('Empty result'); - - return result; - } - - // Throw errors - var processDataObject = function (dataObject) { - var result; - - if (typeof dataObject === 'undefined') - throw new Error('Empty parameter'); - - if (typeof dataObject.data === 'undefined' - || !(dataObject.data instanceof Array)) - throw new Error('Object malformed'); - - /* { - * head: [,,...,], - * data: [ - * [,,...,], - * [,,...,], - * ..., - * [,,...,], - * ] - * } - */ - if (type === 'csv') { - result = { - head: ['timestap', 'date', 'value', 'label'], - data: [] - }; - - dataObject.data.forEach(function (item, index) { - var timestap = item[0]; - - var d = new Date(item[0]); - var monthNames = [ - "Jan", "Feb", "Mar", - "Apr", "May", "Jun", - "Jul", "Aug", "Sep", - "Oct", "Nov", "Dec" - ]; - - date_format = (d.getDate() <10?'0':'') + d.getDate() + " " + - monthNames[d.getMonth()] + " " + - d.getFullYear() + " " + - (d.getHours()<10?'0':'') + d.getHours() + ":" + - (d.getMinutes()<10?'0':'') + d.getMinutes() + ":" + - (d.getSeconds()<10?'0':'') + d.getSeconds(); - - var date = date_format; - - var value = item[1]; - - var clean_label = plot.getOptions().export.labels_long[dataObject.label]; - clean_label = clean_label.replace( new RegExp(" ", "g"), " "); - result.data.push([timestap, date, value, clean_label]); - }); - } - /* [ - * { - * 'date': , - * 'value': - * } - * ], - * [ - * { - * 'date': , - * 'value': - * } - * ], - * ..., - * [ - * { - * 'date': , - * 'value': - * } - * ] - */ - else if (type === 'json') { - result = []; - - dataObject.data.forEach(function (item, index) { - var date = '', value = item[1]; - - // Long labels are preferred - if (typeof labels_long[index] !== 'undefined') - date = labels_long[index]; - else if (typeof labels[index] !== 'undefined') - date = labels[index]; - - result.push({ - 'date': date, - 'value': value, - 'label': dataObject.label - }); - }); - } - - if (typeof result === 'undefined') - throw new Error('Empty result'); - - return result; - } - - try { - var elements = []; - var custom_graph = $('#hidden-custom_graph').val(); - - if (custom_graph) { - dataObject = retrieveDataOject(dataObjects,0); - dataObjects.forEach(function (element) { - elements.push(processDataObject(element)); - }); - graphData = elements; - } - else { - dataObject = retrieveDataOject(dataObjects,1); - elements.push(processDataObject(dataObject)); - graphData = elements; - } - - // Transform the object data into a string - // cause PHP has limitations in the number - // of POST params received. - var graphDataStr = JSON.stringify(graphData); - - // Build form - var $form = $('
'), - $dataInput = $(''), - $typeInput = $(''), - $separatorInput = $(''), - $excelInput = $(''); - - $dataInput - .prop('name', 'data') - .prop('type', 'text') - .prop('value', graphDataStr); - - $typeInput - .prop('name', 'type') - .prop('type', 'text') - .prop('value', type); - - $separatorInput - .prop('name', 'separator') - .prop('type', 'text') - .prop('value', ';'); - - $excelInput - .prop('name', 'excel_encoding') - .prop('type', 'text') - .prop('value', 0); - - $form - .prop('method', 'POST') - .prop('action', plot.getOptions().export.homeurl + 'include/graphs/export_data.php') - .append($dataInput, $typeInput, $separatorInput, $excelInput) - .hide() - // Firefox made me write into the DOM for this :( - .appendTo('body') - .submit(); - } - catch (e) { - alert('There was an error exporting the data'); - } - } - - plot.exportDataJSON = function (args) { - //amount = plot.getOptions().export.type, - //options = options || {}; - - // Options - var type = 'json'; + var type = "csv"; type = type.toLowerCase().trim(); var graphData, @@ -233,8 +25,8 @@ var retrieveDataOject = function (dataObjects) { var result; - if (typeof dataObjects === 'undefined') - throw new Error('Empty parameter'); + if (typeof dataObjects === "undefined") + throw new Error("Empty parameter"); // Try to retrieve the avg set (not 100% reliable, I know) if (dataObjects.length == 1) { @@ -242,31 +34,30 @@ } if (dataObjects.length > 1) { dataObjects.forEach(function (element) { - if (/^Avg.:/i.test(element.label)) - result = element; + if (/^Avg.:/i.test(element.label)) result = element; }); // If the avg set is missing, retrieve the first set - if (typeof result === 'undefined') - result = dataObjects.shift(); + if (typeof result === "undefined") result = dataObjects.shift(); } - if (typeof result === 'undefined') - throw new Error('Empty result'); + if (typeof result === "undefined") throw new Error("Empty result"); return result; - } + }; // Throw errors var processDataObject = function (dataObject) { var result; - if (typeof dataObject === 'undefined') - throw new Error('Empty parameter'); + if (typeof dataObject === "undefined") + throw new Error("Empty parameter"); - if (typeof dataObject.data === 'undefined' - || !(dataObject.data instanceof Array)) - throw new Error('Object malformed'); + if ( + typeof dataObject.data === "undefined" || + !(dataObject.data instanceof Array) + ) + throw new Error("Object malformed"); /* { * head: [,,...,], @@ -278,74 +69,291 @@ * ] * } */ - if (type === 'csv') { - + if (type === "csv") { result = { - head: ['date', 'value','label'], - data: [] + head: ["timestap", "date", "value", "label"], + data: [], }; dataObject.data.forEach(function (item, index) { - var date = '', value = item[1]; + var timestap = item[0]; - // Long labels are preferred - if (typeof plot.getOptions().export.labels_long[index] !== 'undefined') - date = plot.getOptions().export.labels_long[index]; - else if (typeof labels[index] !== 'undefined') - date = labels[index]; + var d = new Date(item[0]); + var monthNames = [ + "Jan", + "Feb", + "Mar", + "Apr", + "May", + "Jun", + "Jul", + "Aug", + "Sep", + "Oct", + "Nov", + "Dec", + ]; - result.data.push([date, value,dataObject.label]); + date_format = + (d.getDate() < 10 ? "0" : "") + + d.getDate() + + " " + + monthNames[d.getMonth()] + + " " + + d.getFullYear() + + " " + + (d.getHours() < 10 ? "0" : "") + + d.getHours() + + ":" + + (d.getMinutes() < 10 ? "0" : "") + + d.getMinutes() + + ":" + + (d.getSeconds() < 10 ? "0" : "") + + d.getSeconds(); + + var date = date_format; + + var value = item[1]; + + var clean_label = plot.getOptions().export.labels_long[ + dataObject.label + ]; + clean_label = clean_label.replace(new RegExp(" ", "g"), " "); + result.data.push([timestap, date, value, clean_label]); }); - } - /* [ - * { - * 'date': , - * 'value': - * } - * ], - * [ - * { - * 'date': , - * 'value': - * } - * ], - * ..., - * [ - * { - * 'date': , - * 'value': - * } - * ] - */ - else if (type === 'json') { + } else if (type === "json") { + /* [ + * { + * 'date': , + * 'value': + * } + * ], + * [ + * { + * 'date': , + * 'value': + * } + * ], + * ..., + * [ + * { + * 'date': , + * 'value': + * } + * ] + */ result = []; dataObject.data.forEach(function (item, index) { - var date = '', value = item[1]; + var date = "", + value = item[1]; // Long labels are preferred - if (typeof labels_long[index] !== 'undefined') + if (typeof labels_long[index] !== "undefined") date = labels_long[index]; - else if (typeof labels[index] !== 'undefined') - date = labels[index]; + else if (typeof labels[index] !== "undefined") date = labels[index]; result.push({ - 'date': date, - 'value': value, - 'label': dataObject.label + date: date, + value: value, + label: dataObject.label, }); }); } - if (typeof result === 'undefined') - throw new Error('Empty result'); + if (typeof result === "undefined") throw new Error("Empty result"); return result; - } + }; try { var elements = []; - var custom_graph = $('input:hidden[name=custom_graph]').value; + dataObject = retrieveDataOject(dataObjects); + if (dataObject) { + elements.push(processDataObject(dataObject)); + } + dataObjects.forEach(function (element) { + elements.push(processDataObject(element)); + }); + graphData = elements; + + + // Transform the object data into a string + // cause PHP has limitations in the number + // of POST params received. + var graphDataStr = JSON.stringify(graphData); + + // Build form + var $form = $("
"), + $dataInput = $(""), + $typeInput = $(""), + $separatorInput = $(""), + $excelInput = $(""); + + $dataInput + .prop("name", "data") + .prop("type", "text") + .prop("value", graphDataStr); + + $typeInput + .prop("name", "type") + .prop("type", "text") + .prop("value", type); + + $separatorInput + .prop("name", "separator") + .prop("type", "text") + .prop("value", ";"); + + $excelInput + .prop("name", "excel_encoding") + .prop("type", "text") + .prop("value", 0); + + $form + .prop("method", "POST") + .prop( + "action", + plot.getOptions().export.homeurl + "include/graphs/export_data.php" + ) + .append($dataInput, $typeInput, $separatorInput, $excelInput) + .hide() + // Firefox made me write into the DOM for this :( + .appendTo("body") + .submit(); + } catch (e) { + alert("There was an error exporting the data"); + } + }; + + plot.exportDataJSON = function (args) { + //amount = plot.getOptions().export.type, + //options = options || {}; + + // Options + var type = "json"; + type = type.toLowerCase().trim(); + + var graphData, + dataObject, + dataObjects = plot.getData(), + result = []; + + // Throw errors + var retrieveDataOject = function (dataObjects) { + var result; + + if (typeof dataObjects === "undefined") + throw new Error("Empty parameter"); + + // Try to retrieve the avg set (not 100% reliable, I know) + if (dataObjects.length == 1) { + result = dataObjects.shift(); + } + if (dataObjects.length > 1) { + dataObjects.forEach(function (element) { + if (/^Avg.:/i.test(element.label)) result = element; + }); + + // If the avg set is missing, retrieve the first set + if (typeof result === "undefined") result = dataObjects.shift(); + } + + if (typeof result === "undefined") throw new Error("Empty result"); + + return result; + }; + + // Throw errors + var processDataObject = function (dataObject) { + var result; + + if (typeof dataObject === "undefined") + throw new Error("Empty parameter"); + + if ( + typeof dataObject.data === "undefined" || + !(dataObject.data instanceof Array) + ) + throw new Error("Object malformed"); + + /* { + * head: [,,...,], + * data: [ + * [,,...,], + * [,,...,], + * ..., + * [,,...,], + * ] + * } + */ + if (type === "csv") { + result = { + head: ["date", "value", "label"], + data: [], + }; + + dataObject.data.forEach(function (item, index) { + var date = "", + value = item[1]; + + // Long labels are preferred + if ( + typeof plot.getOptions().export.labels_long[index] !== "undefined" + ) + date = plot.getOptions().export.labels_long[index]; + else if (typeof labels[index] !== "undefined") date = labels[index]; + + result.data.push([date, value, dataObject.label]); + }); + } else if (type === "json") { + /* [ + * { + * 'date': , + * 'value': + * } + * ], + * [ + * { + * 'date': , + * 'value': + * } + * ], + * ..., + * [ + * { + * 'date': , + * 'value': + * } + * ] + */ + result = []; + + dataObject.data.forEach(function (item, index) { + var date = "", + value = item[1]; + + // Long labels are preferred + if (typeof labels_long[index] !== "undefined") + date = labels_long[index]; + else if (typeof labels[index] !== "undefined") date = labels[index]; + + result.push({ + date: date, + value: value, + label: dataObject.label, + }); + }); + } + + if (typeof result === "undefined") throw new Error("Empty result"); + + return result; + }; + + try { + var elements = []; + var custom_graph = $("input:hidden[name=custom_graph]").value; if (custom_graph) { dataObject = retrieveDataOject(dataObjects); @@ -353,8 +361,7 @@ elements.push(processDataObject(element)); }); graphData = elements; - } - else { + } else { dataObject = retrieveDataOject(dataObjects); elements.push(processDataObject(dataObject)); graphData = elements; @@ -366,51 +373,53 @@ var graphDataStr = JSON.stringify(graphData); // Build form - var $form = $('
'), - $dataInput = $(''), - $typeInput = $(''), - $separatorInput = $(''), - $excelInput = $(''); + var $form = $("
"), + $dataInput = $(""), + $typeInput = $(""), + $separatorInput = $(""), + $excelInput = $(""); $dataInput - .prop('name', 'data') - .prop('type', 'text') - .prop('value', graphDataStr); + .prop("name", "data") + .prop("type", "text") + .prop("value", graphDataStr); $typeInput - .prop('name', 'type') - .prop('type', 'text') - .prop('value', type); + .prop("name", "type") + .prop("type", "text") + .prop("value", type); $separatorInput - .prop('name', 'separator') - .prop('type', 'text') - .prop('value', ';'); + .prop("name", "separator") + .prop("type", "text") + .prop("value", ";"); $excelInput - .prop('name', 'excel_encoding') - .prop('type', 'text') - .prop('value', 0); + .prop("name", "excel_encoding") + .prop("type", "text") + .prop("value", 0); $form - .prop('method', 'POST') - .prop('action', plot.getOptions().export.homeurl + 'include/graphs/export_data.php') + .prop("method", "POST") + .prop( + "action", + plot.getOptions().export.homeurl + "include/graphs/export_data.php" + ) .append($dataInput, $typeInput, $separatorInput, $excelInput) .hide() // Firefox made me write into the DOM for this :( - .appendTo('body') + .appendTo("body") .submit(); + } catch (e) { + alert("There was an error exporting the data"); } - catch (e) { - alert('There was an error exporting the data'); - } - } + }; } - $.plot.plugins.push({ - init: init, - options: options, - name: 'exportdata', - version: '0.1' - }); -})(jQuery); \ No newline at end of file + $.plot.plugins.push({ + init: init, + options: options, + name: "exportdata", + version: "0.1", + }); +})(jQuery); From 57ccd783b070d526d5f2a46e663e7b993580020d Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Thu, 14 May 2020 17:42:58 +0200 Subject: [PATCH 011/116] Merge branch 'develop' into 'ent-5756-pantallas-de-configuracion-del-cluster' --- .../general/first_task/cluster_builder.php | 2 +- .../include/class/CredentialStore.class.php | 5 +- pandora_console/include/class/HTML.class.php | 54 +-- pandora_console/include/constants.php | 3 + pandora_console/include/functions_agents.php | 24 +- pandora_console/include/functions_html.php | 386 +++++++++++++++++- pandora_console/include/functions_ui.php | 7 + pandora_console/include/lib/View.php | 36 +- pandora_console/include/styles/pandora.css | 26 +- pandora_console/vendor/composer/LICENSE | 2 - .../vendor/composer/autoload_classmap.php | 35 ++ .../vendor/composer/autoload_real.php | 3 + .../vendor/composer/autoload_static.php | 35 ++ .../views/dashboard/configurationWidgets.php | 3 +- .../views/dashboard/formDashboard.php | 3 +- .../views/dashboard/formSlides.php | 3 +- .../views/dashboard/listWidgets.php | 3 +- 17 files changed, 564 insertions(+), 66 deletions(-) diff --git a/pandora_console/general/first_task/cluster_builder.php b/pandora_console/general/first_task/cluster_builder.php index e80d4e4b15..1b67906aa7 100644 --- a/pandora_console/general/first_task/cluster_builder.php +++ b/pandora_console/general/first_task/cluster_builder.php @@ -52,7 +52,7 @@ ui_print_info_message(['no_close' => true, 'message' => __('There are no cluster if (check_acl($config['id_user'], 0, 'AW')) { ?> -
+
diff --git a/pandora_console/include/class/CredentialStore.class.php b/pandora_console/include/class/CredentialStore.class.php index 3acaf66d41..64d7c7c1a8 100644 --- a/pandora_console/include/class/CredentialStore.class.php +++ b/pandora_console/include/class/CredentialStore.class.php @@ -161,14 +161,15 @@ class CredentialStore extends Wizard if (! check_acl($config['id_user'], 0, 'AR')) { db_pandora_audit( 'ACL Violation', - 'Trying to access event viewer' + 'Trying to access credential store' ); if (is_ajax()) { echo json_encode(['error' => 'noaccess']); + } else { + include 'general/noaccess.php'; } - include 'general/noaccess.php'; exit; } diff --git a/pandora_console/include/class/HTML.class.php b/pandora_console/include/class/HTML.class.php index 9ebf241377..c76c991766 100644 --- a/pandora_console/include/class/HTML.class.php +++ b/pandora_console/include/class/HTML.class.php @@ -342,7 +342,7 @@ class HTML * * @return string */ - public function error($message) + public static function error($message) { if (is_ajax()) { echo json_encode( @@ -363,7 +363,7 @@ class HTML * * @return string HTML code for desired input. */ - public function printInput($data) + public static function printInput($data) { global $config; @@ -398,7 +398,7 @@ class HTML * * @return void */ - public function printGoBackButton($url=null) + public static function printGoBackButton($url=null) { if (isset($url) === false) { $url = ui_get_full_url( @@ -425,7 +425,7 @@ class HTML ], ]; - $this->printForm($form); + self::printForm($form); } @@ -467,7 +467,7 @@ class HTML * * @return string HTML content. */ - public function printBlock( + public static function printBlock( array $input, bool $return=false, bool $direct=false @@ -502,7 +502,7 @@ class HTML $html = ''; foreach ($input['block_content'] as $in) { - $html .= $this->printBlock( + $html .= self::printBlock( $in, $return, (bool) $direct @@ -549,14 +549,14 @@ class HTML } $output .= ''; - $output .= $this->printInput($input['arguments']); + $output .= self::printInput($input['arguments']); // Allow dynamic content. $output .= $input['extra']; if (!$direct) { $output .= ''; } } else { - $output .= $this->printInput($input['arguments']); + $output .= self::printInput($input['arguments']); // Allow dynamic content. $output .= $input['extra']; } @@ -578,7 +578,7 @@ class HTML * * @return string HTML content. */ - public function printBlockAsGrid(array $input, bool $return=false) + public static function printBlockAsGrid(array $input, bool $return=false) { $output = ''; if ($input['hidden'] == 1) { @@ -596,7 +596,7 @@ class HTML $output .= '
  • '; $output .= '
      '; foreach ($input['block_content'] as $input) { - $output .= $this->printBlockAsGrid($input, $return); + $output .= self::printBlockAsGrid($input, $return); } $output .= '
    • '; @@ -635,7 +635,7 @@ class HTML if ($input['arguments']['type'] == 'text' || $input['arguments']['type'] == 'text_extended') { $output .= '
    '; - $output .= $this->printInput($input['arguments']); + $output .= self::printInput($input['arguments']); $output .= '
    '; } else if ($input['arguments']['inline'] == 'true') { if (isset($input['extra'])) { @@ -646,7 +646,7 @@ class HTML $output .= '
    '; } - $output .= $this->printInput($input['arguments']); + $output .= self::printInput($input['arguments']); $output .= '
    '; $output .= ''; @@ -654,14 +654,14 @@ class HTML $output .= ''; } } else { - $output .= $this->printInput($input['arguments']); + $output .= self::printInput($input['arguments']); } // Allow dynamic content. $output .= $input['extra']; $output .= ''; } else { - $output .= $this->printInput($input['arguments']); + $output .= self::printInput($input['arguments']); // Allow dynamic content. $output .= $input['extra']; } @@ -683,7 +683,7 @@ class HTML * * @return string HTML content. */ - public function printBlockAsList(array $input, bool $return=false) + public static function printBlockAsList(array $input, bool $return=false) { $output = ''; if ($input['hidden'] == 1) { @@ -701,7 +701,7 @@ class HTML $output .= '
  • '; $output .= '
      '; foreach ($input['block_content'] as $input) { - $output .= $this->printBlockAsList($input, $return); + $output .= self::printBlockAsList($input, $return); } $output .= '
    • '; @@ -711,12 +711,12 @@ class HTML ) { $output .= '
  • '; $output .= ''; - $output .= $this->printInput($input['arguments']); + $output .= self::printInput($input['arguments']); // Allow dynamic content. $output .= $input['extra']; $output .= '
    • '; } else { - $output .= $this->printInput($input['arguments']); + $output .= self::printInput($input['arguments']); // Allow dynamic content. $output .= $input['extra']; } @@ -739,7 +739,7 @@ class HTML * * @return string HTML code. */ - public function printForm( + public static function printForm( array $data, bool $return=false, bool $print_white_box=false @@ -781,9 +781,9 @@ class HTML foreach ($inputs as $input) { if ($input['arguments']['type'] != 'submit') { - $output .= $this->printBlock($input, true); + $output .= self::printBlock($input, true); } else { - $output_submit .= $this->printBlock($input, true); + $output_submit .= self::printBlock($input, true); } } @@ -822,7 +822,7 @@ class HTML * * @return string HTML code. */ - public function printFormAsGrid(array $data, bool $return=false) + public static function printFormAsGrid(array $data, bool $return=false) { $form = $data['form']; @@ -886,9 +886,9 @@ class HTML foreach ($column['inputs'] as $input) { if (is_array($input)) { if ($input['arguments']['type'] != 'submit') { - $output .= $this->printBlockAsGrid($input, true); + $output .= self::printBlockAsGrid($input, true); } else { - $output_submit .= $this->printBlockAsGrid($input, true); + $output_submit .= self::printBlockAsGrid($input, true); } } else { $output .= $input; @@ -933,7 +933,7 @@ class HTML * * @return string HTML code. */ - public function printFormAsList(array $data, bool $return=false) + public static function printFormAsList(array $data, bool $return=false) { $form = $data['form']; $inputs = $data['inputs']; @@ -966,9 +966,9 @@ class HTML foreach ($inputs as $input) { if ($input['arguments']['type'] != 'submit') { - $output .= $this->printBlockAsList($input, true); + $output .= self::printBlockAsList($input, true); } else { - $output_submit .= $this->printBlockAsList($input, true); + $output_submit .= self::printBlockAsList($input, true); } } diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php index e6c4108615..25674080d0 100644 --- a/pandora_console/include/constants.php +++ b/pandora_console/include/constants.php @@ -356,6 +356,9 @@ define('MODULE_PREDICTION_CLUSTER', 5); define('MODULE_PREDICTION_CLUSTER_AA', 6); define('MODULE_PREDICTION_CLUSTER_AP', 7); +// Forced agent OS ID for cluster agents. +define('CLUSTER_OS_ID', 100); + // Type of Webserver Modules. define('MODULE_WEBSERVER_CHECK_LATENCY', 30); define('MODULE_WEBSERVER_CHECK_SERVER_RESPONSE', 31); diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index fdb12fac59..2f2f7500bc 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -19,7 +19,29 @@ require_once $config['homedir'].'/include/functions.php'; require_once $config['homedir'].'/include/functions_modules.php'; -require_once $config['homedir'].'/include/functions_users.php'; +require_once $config['homedir'].'/include/functions_users.php';/** + * Return the agent if exists in the DB. + * + * @param integer $id_agent The agent id. + * @param boolean $show_disabled Show the agent found althought it is disabled. By default false. + * @param boolean $force_meta + * + * @return boolean The result to check if the agent is in the DB. + */ + + +function agents_get_agent($id_agent, $show_disabled=true, $force_meta=false) +{ + $agent = db_get_row_filter( + $force_meta ? 'tmetaconsole_agent' : 'tagente', + [ + 'id_agente' => $id_agent, + 'disabled' => !$show_disabled, + ] + ); + + return $agent; +} /** diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index be1ecac492..1a2277f9ac 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -605,22 +605,24 @@ function html_print_select( $output .= '

    '; } else { $data = file_get_contents($file_name); - echo "

    $file_name (".format_numeric(filesize($file_name) / 1024).' KB)

    '; + echo "

    $file_name (".format_numeric(filesize($file_name) / 1024).' KB) '.ui_print_help_tip(__('The folder /var/log/pandora must have pandora:apache and its content too.'), true).'

    '; echo "

    '; diff --git a/pandora_console/extensions/quick_shell.php b/pandora_console/extensions/quick_shell.php index 644e9aa564..4192e9f351 100644 --- a/pandora_console/extensions/quick_shell.php +++ b/pandora_console/extensions/quick_shell.php @@ -449,10 +449,7 @@ function quickShellSettings() $hidden->data = []; $hidden->style[0] = 'font-weight: bold;width: 40%;'; - $hidden->data[0][0] = __('Gotty user').ui_print_help_tip( - __('Optional, set a user to access gotty service'), - true - ); + $hidden->data[0][0] = __('Gotty user'); $hidden->data[0][1] = html_print_input_text( 'gotty_user', $config['gotty_user'], @@ -462,10 +459,7 @@ function quickShellSettings() true ); - $hidden->data[1][0] = __('Gotty password').ui_print_help_tip( - __('Optional, set a password to access gotty service'), - true - ); + $hidden->data[1][0] = __('Gotty password'); $hidden->data[1][1] = html_print_input_password( 'gotty_pass', io_output_password($config['gotty_pass']), diff --git a/pandora_console/general/sap_view.php b/pandora_console/general/sap_view.php index 58ee50e563..a66ae80d0a 100644 --- a/pandora_console/general/sap_view.php +++ b/pandora_console/general/sap_view.php @@ -38,6 +38,16 @@ enterprise_include_once('/include/class/SAPView.class.php'); $ajaxPage = 'general/sap_view'; +// Header. +ui_print_page_header( + __('SAP view'), + '', + false, + 'sap_view', + false, + '' +); + // Control call flow. try { // User access and validation is being processed on class constructor. diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index e5a10f0a53..042e7eeac3 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -205,7 +205,7 @@ $custom_id_div .= html_print_input_text( ).''; if (!$new_agent && $alias != '') { - $table_agent_name = '

    '.__('Agent name').': '.ui_print_help_tip(__("The agent's name must be the same as the one defined at the console"), true).'

    '; + $table_agent_name = '

    '.__('Agent name').'

    '; $table_agent_name .= '
    '; $table_agent_name .= '
    '.html_print_input_text('agente', $nombre_agente, '', 50, 100, true).'
    '; $table_agent_name .= '
    '; @@ -247,10 +247,7 @@ if (!$new_agent && $alias != '') { 'title' => __('This agent can be remotely configured'), ] ); - $table_agent_name .= ''.ui_print_help_tip( - __('You can remotely edit this agent configuration'), - true - ); + $table_agent_name .= ''; } } @@ -258,7 +255,7 @@ if (!$new_agent && $alias != '') { // QR code div. $table_qr_code = '
    '; - $table_qr_code .= '

    '.__('QR Code Agent view').':

    '; + $table_qr_code .= '

    '.__('QR Code Agent view').'

    '; $table_qr_code .= '
    '; if ($id_agente) { $table_qr_code .= ""; @@ -275,7 +272,7 @@ if ($new_agent) { $label_select_parent = 'label_select_parent'; } -$table_alias = '

    '.__('Alias').': '.ui_print_help_tip(__('Characters /,\,|,%,#,&,$ will be ignored'), true).'

    '; +$table_alias = '

    '.__('Alias').'

    '; $table_alias .= '
    '; $table_alias .= '
    '.html_print_input_text('alias', $alias, '', 50, 100, true, false, true).'
    '; if ($new_agent) { @@ -284,10 +281,10 @@ if ($new_agent) { $table_alias .= '
    '; -$table_ip = '

    '.__('IP Address').':

    '; +$table_ip = '

    '.__('IP Address').'

    '; $table_ip .= '
    '; $table_ip .= '
    '.html_print_input_text('direccion', $direccion_agente, '', 16, 100, true).'
    '; -$table_ip .= '
    '.html_print_checkbox_switch('unique_ip', 1, $config['unique_ip'], true).__('Unique IP').ui_print_help_tip(__('Set the primary IP address as the unique IP, preventing the same primary IP address from being used in more than one agent'), true).'
    '; +$table_ip .= '
    '.html_print_checkbox_switch('unique_ip', 1, $config['unique_ip'], true).__('Unique IP').'
    '; $table_ip .= '
    '; if ($id_agente) { @@ -321,7 +318,7 @@ if (is_array($modules)) { } } -$table_primary_group = '

    '.__('Primary group').':

    '; +$table_primary_group = '

    '.__('Primary group').'

    '; $table_primary_group .= '
    '; // Cannot change primary group if user have not permission for that group. if (isset($groups[$grupo]) || $new_agent) { @@ -335,7 +332,7 @@ $table_primary_group .= '

    '.__('Interval').':

    '; +$table_interval = '

    '.__('Interval').'

    '; $table_interval .= '
    '; $table_interval .= html_print_extended_select_for_time( 'intervalo', @@ -358,7 +355,7 @@ if ($intervalo < SECONDS_5MINUTES) { $table_interval .= '
    '; -$table_os = '

    '.__('OS').':

    '; +$table_os = '

    '.__('OS').'

    '; $table_os .= '
    '; $table_os .= html_print_select_from_sql( 'SELECT id_os, name FROM tconfig_os', @@ -380,7 +377,7 @@ if (!array_key_exists($server_name, $servers)) { // Set the agent have not server. } -$table_server = '

    '.__('Server').':

    '; +$table_server = '

    '.__('Server').'

    '; $table_server .= '
    '; if ($new_agent) { // Set first server by default. @@ -400,7 +397,7 @@ $table_server .= html_print_select( ).'
    '; // Description. -$table_description = '

    '.__('Description').':

    '; +$table_description = '

    '.__('Description').'

    '; $table_description .= html_print_textarea( 'comentarios', 3, @@ -425,7 +422,7 @@ echo '
    '; if (enterprise_installed()) { $secondary_groups_selected = enterprise_hook('agents_get_secondary_groups', [$id_agente]); - $adv_secondary_groups_label = '

    '.__('Secondary groups').':

    '; + $adv_secondary_groups_label = '

    '.__('Secondary groups').'

    '; $adv_secondary_groups_left = html_print_select_groups( false, // Use the current user to select the groups. @@ -532,20 +529,13 @@ if (enterprise_installed()) { } } - $table_adv_safe = '

    '.__('Safe operation mode').': '.ui_print_help_tip( - __( - 'This mode allow %s to disable all modules - of this agent while the selected module is on CRITICAL status', - get_product_name() - ), - true - ).'

    '; + $table_adv_safe = '

    '.__('Safe operation mode').'

    '; $table_adv_safe .= html_print_checkbox_switch('safe_mode', 1, $safe_mode, true); $table_adv_safe .= __('Module').' '.html_print_select($safe_mode_modules, 'safe_mode_module', $safe_mode_module, '', '', 0, true).'
    '; } // Remote configuration. - $table_adv_remote = '

    '.__('Remote configuration').':

    '; + $table_adv_remote = '

    '.__('Remote configuration').'

    '; if (!$new_agent && isset($filename) && file_exists($filename['md5'])) { $table_adv_remote .= date('F d Y H:i:s', fileatime($filename['md5'])); @@ -559,10 +549,7 @@ if (enterprise_installed()) { 'style' => 'vertical-align: middle;', ] ).''; - $table_adv_remote .= ''.ui_print_help_tip( - __('Delete this conf file implies that for restore you must reactive remote config in the local agent.'), - true - ); + $table_adv_remote .= ''; } else { $table_adv_remote .= ''.__('Not available').''; } @@ -583,17 +570,13 @@ if (enterprise_installed()) { $cps_html = '
    '; $cps_html .= html_print_checkbox_switch('cps', $cps_val, ($cps >= 0), true); $cps_html .= __('Cascade protection services').' '; - $cps_html .= ui_print_help_tip( - __('Alerts and events will be managed by the service joined by this agent.'), - true - ); $cps_html .= '
    '; $table_adv_cascade .= $cps_html; } -$table_adv_parent = '
    '; +$table_adv_parent = '
    '; $params = []; $params['return'] = true; $params['show_helptip'] = true; @@ -629,7 +612,7 @@ if (enterprise_installed()) { $table_adv_parent .= '
    '; // Learn mode / Normal mode. -$table_adv_module_mode = '

    '.__('Module definition').':

    '; +$table_adv_module_mode = '

    '.__('Module definition').'

    '; $table_adv_module_mode .= '
    '; $table_adv_module_mode .= html_print_radio_button_extended( 'modo', @@ -671,12 +654,12 @@ $table_adv_status .= html_print_checkbox_switch( $disabled, true ); -$table_adv_status .= '

    '.__('Disabled mode').': '.ui_print_help_tip(__('If the remote configuration is enabled, it will also go into standby mode when disabling it.'), true).'

    '; +$table_adv_status .= '

    '.__('Disabled mode').'

    '; $table_adv_status .= '
    '; // Url address. if (enterprise_installed()) { - $table_adv_url = '

    '.__('Url address').': '.ui_print_help_tip(__('URL address must be complete, for example: https://pandorafms.com/'), true).'

    '; + $table_adv_url = '

    '.__('Url address').'

    '; $table_adv_url .= html_print_input_text( 'url_description', $url_description, @@ -693,7 +676,7 @@ if (enterprise_installed()) { 'new-password' ).'
    '; } else { - $table_adv_url = '

    '.__('Url address').':

    '; + $table_adv_url = '

    '.__('Url address').'

    '; $table_adv_url .= html_print_input_text( 'url_description', $url_description, @@ -706,8 +689,7 @@ if (enterprise_installed()) { $table_adv_quiet = '
    '; $table_adv_quiet .= html_print_checkbox_switch('quiet', 1, $quiet, true); -$table_adv_quiet .= '

    '.__('Quiet').': '; -$table_adv_quiet .= ui_print_help_tip(__('The agent still runs but the alerts and events will be stop'), true).'

    '; +$table_adv_quiet .= '

    '.__('Quiet').'

    '; $table_adv_quiet .= '
    '; $listIcons = gis_get_array_list_icons(); @@ -719,7 +701,7 @@ foreach ($listIcons as $index => $value) { $path = 'images/gis_map/icons/'; // TODO set better method the path. -$table_adv_agent_icon = '

    '.__('Agent icon').': '.ui_print_help_tip(__('Agent icon for GIS Maps.'), true).'

    '; +$table_adv_agent_icon = '

    '.__('Agent icon').'

    '; if ($icon_path == '') { $display_icons = 'none'; // Hack to show no icon. Use any given image to fix not found image errors. @@ -831,10 +813,7 @@ $table->width = '100%'; $table->class = 'custom_fields_table'; $table->head = [ - 0 => __('Click to display').ui_print_help_tip( - __('This field allows url insertion using the BBCode\'s url tag').'.
    '.__('The format is: [url=\'url to navigate\']\'text to show\'[/url] or [url]\'url to navigate\'[/url] ').'.

    '.__('e.g.: [url=google.com]Google web search[/url] or [url]www.goole.com[/url]'), - true - ), + 0 => __('Click to display'), ]; $table->class = 'info_table'; $table->style = []; diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index e68a74bcf1..0635e8e6be 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -698,13 +698,14 @@ if ($id_agente) { break; } + $helper = ($help_header === 'main_tab') ? 'main_tab' : ''; $pure = get_parameter('pure', 0); if (!$pure) { ui_print_page_header( agents_get_alias($id_agente), 'images/setup.png', false, - $help_header, + $helper, true, $onheader, false, diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index 970feb7ef3..9948554591 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -572,15 +572,13 @@ if ($moduletype == MODULE_DATA) { if ($__code_from == 'policies') { // If is the policy form, module_interval will store the factor (not the seconds). - // So server will transform it to interval in seconds + // So server will transform it to interval in seconds. $table_advanced->data[1][1] = sprintf(__('Default').': 1', $interval_factor); $table_advanced->data[1][1] .= html_print_input_hidden('module_interval', $interval_factor, true); - } else if ($module_id_policy_module != 0) { - $table_advanced->data[1][1] .= ui_print_help_tip(__('The policy modules of data type will only update their intervals when policy is applied.'), true); } - // If it is a non policy form, the module_interval will not provided and will - // be taken the agent interval (this code is at configurar_agente.php) + // If it is a non policy form, the module_interval will not provided and will. + // be taken the agent interval (this code is at configurar_agente.php). } else { $table_advanced->data[1][0] = __('Interval'); $table_advanced->colspan[1][1] = 2; @@ -607,9 +605,9 @@ $table_advanced->colspan[1][4] = 3; $table_advanced->data[2][0] = __('Min. Value'); $table_advanced->colspan[2][1] = 2; -$table_advanced->data[2][1] = html_print_input_text('min', $min, '', 5, 15, true, $disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy).' '.ui_print_help_tip(__('Any value below this number is discarted.'), true); +$table_advanced->data[2][1] = html_print_input_text('min', $min, '', 5, 15, true, $disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy); $table_advanced->data[2][3] = __('Max. Value'); -$table_advanced->data[2][4] = html_print_input_text('max', $max, '', 5, 15, true, $disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy).' '.ui_print_help_tip(__('Any value over this number is discarted.'), true); +$table_advanced->data[2][4] = html_print_input_text('max', $max, '', 5, 15, true, $disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy); $table_advanced->colspan[2][4] = 3; @@ -685,10 +683,10 @@ $table_advanced->data[4][1] = html_print_select_from_sql( false, false, $disabled_export -).ui_print_help_tip(__('In case you use an Export server you can link this module and export data to one these.'), true); +); $table_advanced->colspan[4][1] = 2; -// Code comes from module_editor +// Code comes from module_editor. if ($__code_from == 'modules') { $throw_unknown_events_check = modules_is_disable_type_event($id_agent_module, EVENTS_GOING_UNKNOWN); } else { @@ -806,7 +804,7 @@ $table_advanced->data[6][1] = html_print_input_text( false, '', $classdisabledBecauseInPolicy -).ui_print_help_tip(__('Module execution flip flop time interval (in secs).'), true); +); $table_advanced->colspan[6][1] = 2; $table_advanced->data[6][3] = __('FF timeout'); @@ -822,11 +820,11 @@ if (preg_match('/async/', $module_type_name) || $edit) { 10, true, $disabledBecauseInPolicy - ).ui_print_help_tip(__('Timeout in secs from start of flip flop counting. If this value is exceeded, FF counter is reset. Set to 0 for no timeout.'), true).''; + ).''; } if (!preg_match('/async/', $module_type_name) || $edit) { - $table_advanced->data[6][4] .= ''.__('Disabled').ui_print_help_tip(__('This value can be set only in the async modules.'), true).''; + $table_advanced->data[6][4] .= ''.__('Disabled').''; } $table_advanced->colspan[6][4] = 3; @@ -972,7 +970,6 @@ if ($__code_from == 'modules') { } $table_advanced->data[8][0] = __('Quiet'); -$table_advanced->data[8][0] .= ui_print_help_tip(__('The module still stores data but the alerts and events will be stop'), true); $table_advanced->data[8][1] = html_print_checkbox('quiet_module', 1, $quiet_module, true, $disabledBecauseInPolicy); $cps_array[-1] = __('Disabled'); @@ -992,7 +989,6 @@ if ($cps_module > 0) { $table_advanced->data[8][2] = ''; $table_advanced->data[8][3] = __('Cascade Protection Services'); -$table_advanced->data[8][3] .= ui_print_help_tip(__('Disable the alerts and events of the elements that belong to this service'), true); $table_advanced->colspan[8][4] = 3; $table_advanced->data[8][4] = html_print_select($cps_array, 'cps_module', $cps_module, '', '', 0, true, false, true, '', $disabledBecauseInPolicy); @@ -1010,16 +1006,16 @@ $table_advanced->data[9][1] = html_print_textarea( $largeClassDisabledBecauseInPolicy ); -$table_advanced->data[10][0] = __('Critical instructions').ui_print_help_tip(__('Instructions when the status is critical'), true); +$table_advanced->data[10][0] = __('Critical instructions'); $table_advanced->data[10][1] = html_print_textarea('critical_instructions', 3, 65, $critical_instructions, $disabledTextBecauseInPolicy.$textarea_custom_style, true, $largeClassDisabledBecauseInPolicy); $table_advanced->colspan[10][1] = 6; -$table_advanced->data[11][0] = __('Warning instructions').ui_print_help_tip(__('Instructions when the status is warning'), true); +$table_advanced->data[11][0] = __('Warning instructions'); $table_advanced->data[11][1] = html_print_textarea('warning_instructions', 3, 65, $warning_instructions, $disabledTextBecauseInPolicy.$textarea_custom_style, true, $largeClassDisabledBecauseInPolicy); $table_advanced->colspan[11][1] = 6; -$table_advanced->data[12][0] = __('Unknown instructions').ui_print_help_tip(__('Instructions when the status is unknown'), true); +$table_advanced->data[12][0] = __('Unknown instructions'); $table_advanced->data[12][1] = html_print_textarea('unknown_instructions', 3, 65, $unknown_instructions, $disabledTextBecauseInPolicy.$textarea_custom_style, true, $largeClassDisabledBecauseInPolicy); $table_advanced->colspan[12][1] = 6; @@ -1053,10 +1049,10 @@ if (isset($id_agente) && $moduletype == MODULE_DATA) { } $table_advanced->data[15][0] = __('Timeout'); -$table_advanced->data[15][1] = html_print_input_text('max_timeout', $max_timeout, '', 5, 10, true, $disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy).' '.ui_print_help_tip(__('Seconds that agent will wait for the execution of the module.'), true); +$table_advanced->data[15][1] = html_print_input_text('max_timeout', $max_timeout, '', 5, 10, true, $disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy); $table_advanced->data[15][2] = ''; $table_advanced->data[15][3] = __('Retries'); -$table_advanced->data[15][4] = html_print_input_text('max_retries', $max_retries, '', 5, 10, true, $disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy).' '.ui_print_help_tip(__('Number of retries that the module will attempt to run.'), true); +$table_advanced->data[15][4] = html_print_input_text('max_retries', $max_retries, '', 5, 10, true, $disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy); $table_advanced->colspan[15][4] = 3; if (check_acl($config['id_user'], 0, 'PM')) { @@ -1223,10 +1219,7 @@ $table_relations->style[4] = 'width: 10%; text-align: center;'; $table_relations->head[0] = __('Agent'); $table_relations->head[1] = __('Module'); $table_relations->head[2] = __('Type'); -$table_relations->head[3] = __('Changes').ui_print_help_tip( - __('Activate this to prevent the relation from being updated or deleted'), - true -); +$table_relations->head[3] = __('Changes'); $table_relations->head[4] = __('Delete'); // Create an invisible row to use their html to add new rows. diff --git a/pandora_console/godmode/agentes/planned_downtime.editor.php b/pandora_console/godmode/agentes/planned_downtime.editor.php index ebf64a87c1..3a055678e8 100644 --- a/pandora_console/godmode/agentes/planned_downtime.editor.php +++ b/pandora_console/godmode/agentes/planned_downtime.editor.php @@ -62,7 +62,7 @@ ui_print_page_header( __('Planned Downtime'), 'images/gm_monitoring.png', false, - 'planned_downtime_editor', + '', true, $buttons ); @@ -717,11 +717,11 @@ $table->data[5][1] = " - + - +
    ".__('From:').''.html_print_input_text('once_date_from', $once_date_from, '', 10, 10, true, $disabled_in_execution).ui_print_help_tip(__('Date format is YY/MM/DD'), true).html_print_input_text('once_time_from', $once_time_from, '', 9, 9, true, $disabled_in_execution).ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true).''.html_print_input_text('once_date_from', $once_date_from, '', 10, 10, true, $disabled_in_execution).html_print_input_text('once_time_from', $once_time_from, '', 9, 9, true, $disabled_in_execution).'
    '.__('To:').''.html_print_input_text('once_date_to', $once_date_to, '', 10, 10, true).ui_print_help_tip(__('Date format is YY/MM/DD'), true).html_print_input_text('once_time_to', $once_time_to, '', 9, 9, true).ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true)."'.html_print_input_text('once_date_to', $once_date_to, '', 10, 10, true).html_print_input_text('once_time_to', $once_time_to, '', 9, 9, true)."
    @@ -804,7 +804,7 @@ $table->data[5][1] = " true, $disabled_in_execution ).ui_print_help_tip( - __('Watch format is hours (24h):minutes:seconds.').'.
    '.__('The end time must be higher than the start time'), + __('The end time must be higher than the start time'), true ).' '.__('To hour:').' @@ -817,7 +817,7 @@ $table->data[5][1] = " true, $disabled_in_execution ).ui_print_help_tip( - __('Watch format is hours (24h):minutes:seconds.').'.
    '.__('The end time must be higher than the start time'), + __('The end time must be higher than the start time'), true ).' diff --git a/pandora_console/godmode/agentes/planned_downtime.list.php b/pandora_console/godmode/agentes/planned_downtime.list.php index f116b2dcd8..acfa2a9039 100755 --- a/pandora_console/godmode/agentes/planned_downtime.list.php +++ b/pandora_console/godmode/agentes/planned_downtime.list.php @@ -55,7 +55,7 @@ ui_print_page_header( __('Scheduled Downtime'), 'images/gm_monitoring.png', false, - 'planned_downtime', + '', true, '' ); diff --git a/pandora_console/godmode/alerts/alert_actions.php b/pandora_console/godmode/alerts/alert_actions.php index 49bb5b03f1..672470397a 100644 --- a/pandora_console/godmode/alerts/alert_actions.php +++ b/pandora_console/godmode/alerts/alert_actions.php @@ -48,17 +48,13 @@ if (defined('METACONSOLE')) { if (defined('METACONSOLE')) { alerts_meta_print_header(); } else { - $header_help = 'alerts_action'; - - if ($copy_action) { - $header_help = 'alerts_config'; - } - - if ($delete_action) { - $header_help = 'alerts_action'; - } - - ui_print_page_header(__('Alerts').' » '.__('Alert actions'), 'images/gm_alerts.png', false, $header_help, true); + ui_print_page_header( + __('Alerts').' » '.__('Alert actions'), + 'images/gm_alerts.png', + false, + '', + true + ); } if ($copy_action) { diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php index 3650c206ab..f14cc37902 100644 --- a/pandora_console/godmode/alerts/alert_commands.php +++ b/pandora_console/godmode/alerts/alert_commands.php @@ -284,7 +284,7 @@ if (defined('METACONSOLE')) { __('Alerts').' » '.__('Alert commands'), 'images/gm_alerts.png', false, - 'alerts_command_tab', + '', true ); } diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php index b8be4f128f..50bef0c656 100644 --- a/pandora_console/godmode/alerts/alert_list.php +++ b/pandora_console/godmode/alerts/alert_list.php @@ -504,9 +504,9 @@ if ($id_agente) { } if ($tab == 'list') { - ui_print_page_header(__('Alerts').' » '.__('Manage alerts').' » '.__('List'), 'images/gm_alerts.png', false, 'alerts_config', true, $buttons); + ui_print_page_header(__('Alerts').' » '.__('Manage alerts').' » '.__('List'), 'images/gm_alerts.png', false, '', true, $buttons); } else { - ui_print_page_header(__('Alerts').' » '.__('Manage alerts').' » '.__('Create'), 'images/gm_alerts.png', false, 'manage_alert_list', true, $buttons); + ui_print_page_header(__('Alerts').' » '.__('Manage alerts').' » '.__('Create'), 'images/gm_alerts.png', false, '', true, $buttons); } } else { alerts_meta_print_header(); diff --git a/pandora_console/godmode/alerts/alert_templates.php b/pandora_console/godmode/alerts/alert_templates.php index d855fa8928..4147367379 100644 --- a/pandora_console/godmode/alerts/alert_templates.php +++ b/pandora_console/godmode/alerts/alert_templates.php @@ -136,7 +136,7 @@ if (!$delete_template) { __('Alerts').' » '.__('Alert templates'), 'images/gm_alerts.png', false, - 'alert_templates_tab', + '', true ); } diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php index 4f3011649b..3d39941bf8 100644 --- a/pandora_console/godmode/alerts/configure_alert_action.php +++ b/pandora_console/godmode/alerts/configure_alert_action.php @@ -52,7 +52,7 @@ if ($al_action !== false) { $is_in_group = in_array($al_action['id_group'], $own_groups); - // Header + // Header. if (defined('METACONSOLE')) { alerts_meta_print_header(); } else { @@ -60,12 +60,12 @@ if ($al_action !== false) { __('Alerts').' » '.__('Configure alert action'), 'images/gm_alerts.png', false, - 'alert_config', + '', true ); } } else { - // Header + // Header. if (defined('METACONSOLE')) { alerts_meta_print_header(); } else { @@ -73,7 +73,7 @@ if ($al_action !== false) { __('Alerts').' » '.__('Configure alert action'), 'images/gm_alerts.png', false, - 'alert_config', + '', true ); } diff --git a/pandora_console/godmode/alerts/configure_alert_command.php b/pandora_console/godmode/alerts/configure_alert_command.php index ac23e44c89..417564e5f2 100644 --- a/pandora_console/godmode/alerts/configure_alert_command.php +++ b/pandora_console/godmode/alerts/configure_alert_command.php @@ -43,7 +43,7 @@ if (defined('METACONSOLE')) { __('Alerts').' » '.__('Configure alert command'), 'images/gm_alerts.png', false, - 'alerts_config_command_tab', + '', true ); } @@ -206,7 +206,7 @@ for ($i = 1; $i <= $config['max_macro_fields']; $i++) { $table->data['field'.$i][1] = html_print_input_text('field'.$i.'_description', $field_description, '', 30, 255, true); - $table->data['field'.$i][2] = sprintf(__('Field %s values'), $i); + $table->data['field'.$i][2] = sprintf(__('Field %s values'), $i).ui_print_help_tip(__('value1,tag1;value2,tag2;value3,tag3'), true); if (!empty($fields_values)) { $field_values = $fields_values[($i - 1)]; diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php index b801e4ddb9..533bc32caf 100644 --- a/pandora_console/godmode/alerts/configure_alert_template.php +++ b/pandora_console/godmode/alerts/configure_alert_template.php @@ -58,11 +58,11 @@ if ($a_template !== false) { } else { $step = (int) get_parameter('step', 1); if ($step == 1) { - $help_header = 'configure_alert_template_step_1'; + $help_header = ''; } else if ($step == 2) { $help_header = 'configure_alert_template_step_2'; } else if ($step == 3) { - $help_header = 'configure_alert_template_step_3'; + $help_header = ''; } ui_print_page_header( @@ -115,11 +115,11 @@ if ($a_template !== false) { } else { $step = (int) get_parameter('step', 1); if ($step == 1) { - $help_header = 'configure_alert_template_step_1'; + $help_header = ''; } else if ($step == 2) { $help_header = 'configure_alert_template_step_2'; } else if ($step == 3) { - $help_header = 'configure_alert_template_step_3'; + $help_header = ''; } ui_print_page_header( @@ -601,7 +601,7 @@ if ($step == 2) { $table->data[0][2] = __('Use special days list'); $table->data[0][3] = html_print_checkbox('special_day', 1, $special_day, true); - $table->data[1][0] = __('Time from').' '.ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true); + $table->data[1][0] = __('Time from'); $table->data[1][1] = html_print_input_text( 'time_from', $time_from, @@ -610,7 +610,7 @@ if ($step == 2) { 8, true ); - $table->data[1][2] = __('Time to').' '.ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true); + $table->data[1][2] = __('Time to'); $table->data[1][3] = html_print_input_text( 'time_to', $time_to, @@ -849,7 +849,7 @@ if ($step == 2) { } // $table->rowclass['field'.$i] = 'row_field'; - $table->data['field'.$i][0] = sprintf(__('Field %s'), $i).ui_print_help_icon('alert_macros', true); + $table->data['field'.$i][0] = sprintf(__('Field %s'), $i); // TinyMCE // triggering fields // basic diff --git a/pandora_console/godmode/events/events.php b/pandora_console/godmode/events/events.php index 72ae001fe1..226e0e9a1f 100644 --- a/pandora_console/godmode/events/events.php +++ b/pandora_console/godmode/events/events.php @@ -70,7 +70,7 @@ switch ($section) { case 'responses': $buttons['responses']['active'] = true; $subpage = ' - '.__('Responses'); - $help_header = 'events_responses_tab'; + $help_header = ''; break; case 'view': diff --git a/pandora_console/godmode/gis_maps/configure_gis_map.php b/pandora_console/godmode/gis_maps/configure_gis_map.php index 8277463e18..a56e69dcb1 100644 --- a/pandora_console/godmode/gis_maps/configure_gis_map.php +++ b/pandora_console/godmode/gis_maps/configure_gis_map.php @@ -420,7 +420,7 @@ $table->class = 'databox filters'; $table->data = []; -$table->data[0][0] = __('Map Name').ui_print_help_tip(__('Descriptive name for the map'), true).':'; +$table->data[0][0] = __('Map Name'); $table->data[0][1] = html_print_input_text('map_name', $map_name, '', 30, 60, true); $table->rowspan[0][2] = 9; @@ -439,7 +439,7 @@ foreach ($listConnectionTemp as $connectionTemp) { } } -$table->data[1][0] = __('Add Map connection').ui_print_help_tip(__('At least one map connection must be defined, it will be possible to change between the connections in the map'), true).': '.$iconError; +$table->data[1][0] = __('Add Map connection').$iconError; $table->data[1][1] = "'; echo "'; echo "'; -echo "'; -echo "'; +echo "'; echo "'; echo "'; echo "'; echo "'; -echo "'; -echo "'; +echo "'; echo ''; echo '
    @@ -459,10 +459,10 @@ if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'MM')) { $display_all_group = false; } -$table->data[2][0] = __('Group').ui_print_help_tip(__('Group that owns the map'), true).':'; +$table->data[2][0] = __('Group'); $table->data[2][1] = html_print_select_groups(false, 'IW', $display_all_group, 'map_group_id', $map_group_id, '', '', '', true); -$table->data[3][0] = __('Default zoom').ui_print_help_tip(__('Default zoom level when opening the map'), true).':'; +$table->data[3][0] = __('Default zoom'); $table->data[3][1] = html_print_input_text('map_zoom_level', $map_zoom_level, '', 2, 4, true).html_print_input_hidden('map_levels_zoom', $map_levels_zoom, true); $table->data[4][0] = __('Center Latitude').':'; @@ -485,7 +485,7 @@ $table->data[9][1] = html_print_input_text('map_default_altitude', $map_default_ html_print_table($table); -echo '

    '.__('Layers').ui_print_help_tip(__('Each layer can show agents from one group or the agents added to that layer or both.'), true).'

    '; +echo '

    '.__('Layers').'

    '; $table->width = '100%'; $table->class = 'databox filters'; @@ -494,7 +494,7 @@ $table->valign[0] = 'top'; $table->valign[1] = 'top'; $table->data = []; -$table->data[0][0] = '

    '.__('List of layers').ui_print_help_tip(__('It is possible to edit, delete and reorder the layers.'), true).'

    '; +$table->data[0][0] = '

    '.__('List of layers').'

    '; $table->data[0][1] = '
    '.html_print_button(__('New layer'), 'new_layer', false, 'newLayer();', 'class="sub add"', true).'
    '; $table->data[1][0] = '
    '; diff --git a/pandora_console/godmode/groups/configure_group.php b/pandora_console/godmode/groups/configure_group.php index 8960b0f1ac..7fe4d6e876 100644 --- a/pandora_console/godmode/groups/configure_group.php +++ b/pandora_console/godmode/groups/configure_group.php @@ -91,7 +91,7 @@ if (defined('METACONSOLE')) { $title_in_header, 'images/group.png', false, - 'create_group_tab', + '', true, '' ); @@ -181,7 +181,7 @@ if ($config['enterprise_installed']) { $table->data[3][1] = html_print_input_password('group_pass', $group_pass, '', 16, 255, true); } -$table->data[$i][0] = __('Alerts'); +$table->data[$i][0] = __('Alerts').ui_print_help_tip(__('Enable alert use in this group.'), true); $table->data[$i][1] = html_print_checkbox_switch('alerts_enabled', 1, ! $alerts_disabled, true); $i++; diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php index 39fed17c8b..314e4431ea 100644 --- a/pandora_console/godmode/groups/group_list.php +++ b/pandora_console/godmode/groups/group_list.php @@ -314,7 +314,7 @@ if (defined('METACONSOLE')) { $title, 'images/group.png', false, - 'group_list_tab', + '', true, $buttons ); diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php index 71c8bbaabd..6a4ca61fcb 100755 --- a/pandora_console/godmode/massive/massive_edit_agents.php +++ b/pandora_console/godmode/massive/massive_edit_agents.php @@ -749,10 +749,6 @@ if ($fields === false) { foreach ($fields as $field) { $data[0] = ''.$field['name'].''; - $data[0] .= ui_print_help_tip( - __('This field allows url insertion using the BBCode\'s url tag').'.
    '.__('The format is: [url=\'url to navigate\']\'text to show\'[/url] or [url]\'url to navigate\'[/url] ').'.

    '.__('e.g.: [url=google.com]Google web search[/url] or [url]www.goole.com[/url]'), - true - ); $combo = []; $combo = $field['combo_values']; $combo = explode(',', $combo); diff --git a/pandora_console/godmode/massive/massive_operations.php b/pandora_console/godmode/massive/massive_operations.php index 0fb08d0034..7393265a3b 100755 --- a/pandora_console/godmode/massive/massive_operations.php +++ b/pandora_console/godmode/massive/massive_operations.php @@ -30,7 +30,7 @@ require_once 'include/functions_modules.php'; enterprise_include('godmode/massive/massive_operations.php'); $tab = (string) get_parameter('tab', 'massive_agents'); -$option = (string) get_parameter('option', ''); +$option = (string) get_parameter('option'); $options_alerts = [ @@ -108,8 +108,36 @@ if (in_array($option, array_keys($options_alerts))) { $tab = 'massive_satellite'; } else if (in_array($option, array_keys($options_plugins))) { $tab = 'massive_plugins'; -} else { - $option = ''; +} + +if ($tab == 'massive_agents' && $option == '') { + $option = 'edit_agents'; +} + +if ($tab == 'massive_modules' && $option == '') { + $option = 'edit_modules'; +} + +if ($tab == 'massive_policies' && $option == '') { + $option = 'edit_policy_modules'; +} + +switch ($option) { + case 'edit_agents': + $help_header = 'massive_agents_tab'; + break; + + case 'edit_modules': + $help_header = 'massive_modules_tab'; + break; + + case 'edit_policy_modules': + $help_header = 'massive_policies_tab'; + break; + + default: + $help_header = ''; + break; } switch ($tab) { @@ -119,12 +147,10 @@ switch ($tab) { case 'massive_agents': $options = $options_agents; - $help_header = 'massive_agents_tab'; break; case 'massive_modules': $options = $options_modules; - $help_header = 'massive_modules_tab'; break; case 'massive_users': @@ -133,7 +159,6 @@ switch ($tab) { case 'massive_policies': $options = $options_policies; - $help_header = 'massive_policies_tab'; break; case 'massive_snmp': diff --git a/pandora_console/godmode/modules/manage_nc_groups.php b/pandora_console/godmode/modules/manage_nc_groups.php index e32644b9a8..16a9cccaad 100644 --- a/pandora_console/godmode/modules/manage_nc_groups.php +++ b/pandora_console/godmode/modules/manage_nc_groups.php @@ -40,7 +40,7 @@ if (defined('METACONSOLE')) { __('Module management').' » '.__('Component group management'), '', false, - 'component_groups', + '', true ); $sec = 'gmodules'; diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php index baa626f1ec..ed691af533 100644 --- a/pandora_console/godmode/modules/manage_network_components.php +++ b/pandora_console/godmode/modules/manage_network_components.php @@ -47,37 +47,6 @@ require_once $config['homedir'].'/include/functions_categories.php'; enterprise_include_once('meta/include/functions_components_meta.php'); require_once $config['homedir'].'/include/functions_component_groups.php'; -// Header. -if (defined('METACONSOLE')) { - components_meta_print_header(); - $sec = 'advanced'; - - $id_modulo = (int) get_parameter('id_component_type'); - $new_component = (bool) get_parameter('new_component'); -} else { - $id_modulo = (int) get_parameter('id_component_type'); - $new_component = (bool) get_parameter('new_component'); - if ($id_modulo == 2 || $id_modulo == 4 || $id_modulo == 6) { - $help_header = 'local_module_tab'; - } else if (!$new_component) { - $help_header = 'network_component_tab'; - } else { - $help_header = 'network_component_tab'; - } - - ui_print_page_header( - __('Module management').' » '.__('Remote component management'), - '', - false, - $help_header, - true, - '', - false, - 'modulemodal' - ); - $sec = 'gmodules'; -} - $type = (int) get_parameter('type'); $name = (string) get_parameter('name'); $description = (string) get_parameter('description'); @@ -95,6 +64,8 @@ $plugin_user = (string) get_parameter('plugin_user'); $plugin_pass = io_input_password((string) get_parameter('plugin_pass')); $plugin_parameter = (string) get_parameter('plugin_parameter'); $macros = (string) get_parameter('macros'); +$id_modulo = (int) get_parameter('id_component_type'); +$new_component = (bool) get_parameter('new_component'); if (!empty($macros)) { $macros = json_decode(base64_decode($macros), true); @@ -213,6 +184,32 @@ $custom_string_1 = ''; $custom_string_2 = ''; $custom_string_3 = ''; +// Header. +if (defined('METACONSOLE')) { + components_meta_print_header(); + $sec = 'advanced'; +} else { + if ($id_modulo == 2 || $id_modulo == 4 || $id_modulo == 6) { + $help_header = 'local_module_tab'; + } else if ($new_component == false && $id == 0) { + $help_header = ''; + } else { + $help_header = 'network_component_tab'; + } + + ui_print_page_header( + __('Module management').' » '.__('Remote component management'), + '', + false, + $help_header, + true, + '', + false, + 'modulemodal' + ); + $sec = 'gmodules'; +} + if ($type >= 15 && $type <= 18) { // New support for snmp v3. $tcp_send = $snmp_version; diff --git a/pandora_console/godmode/modules/manage_network_templates.php b/pandora_console/godmode/modules/manage_network_templates.php index 2050fb916c..eb7d137e08 100644 --- a/pandora_console/godmode/modules/manage_network_templates.php +++ b/pandora_console/godmode/modules/manage_network_templates.php @@ -39,7 +39,7 @@ ui_print_page_header( __('Module management').' » '.__('Module template management'), 'images/gm_modules.png', false, - 'module_template_tab', + '', true, '', true, diff --git a/pandora_console/godmode/netflow/nf_edit.php b/pandora_console/godmode/netflow/nf_edit.php index eb9b84546b..bb7a456a69 100644 --- a/pandora_console/godmode/netflow/nf_edit.php +++ b/pandora_console/godmode/netflow/nf_edit.php @@ -38,7 +38,7 @@ if (! defined('METACONSOLE')) { __('Manage Netflow Filter'), 'images/gm_netflow.png', false, - 'pcap_filter', + '', true ); diff --git a/pandora_console/godmode/netflow/nf_edit_form.php b/pandora_console/godmode/netflow/nf_edit_form.php index cd966ccea8..71f517ad61 100644 --- a/pandora_console/godmode/netflow/nf_edit_form.php +++ b/pandora_console/godmode/netflow/nf_edit_form.php @@ -58,7 +58,7 @@ if (! defined('METACONSOLE')) { __('Netflow Filter'), 'images/gm_netflow.png', false, - 'pcap_filter', + '', true, $buttons ); diff --git a/pandora_console/godmode/reporting/create_container.php b/pandora_console/godmode/reporting/create_container.php index 3c2e144178..5cfcb14338 100644 --- a/pandora_console/godmode/reporting/create_container.php +++ b/pandora_console/godmode/reporting/create_container.php @@ -176,8 +176,15 @@ $buttons['graph_container'] = [ 'text' => ''.html_print_image('images/graph-container.png', true, ['title' => __('Graph container')]).'', ]; -// Header -ui_print_page_header(__('Create container'), '', false, '', false, $buttons); +// Header. +ui_print_page_header( + __('Create container'), + '', + false, + 'create_container', + false, + $buttons +); if ($add_container) { ui_print_result_message($id_container, __('Container stored successfully'), __('There was a problem storing container')); diff --git a/pandora_console/godmode/reporting/graph_builder.main.php b/pandora_console/godmode/reporting/graph_builder.main.php index 9e8f955e79..70ac08216e 100644 --- a/pandora_console/godmode/reporting/graph_builder.main.php +++ b/pandora_console/godmode/reporting/graph_builder.main.php @@ -164,25 +164,17 @@ echo '
    ".__('Percentil').'".html_print_checkbox('percentil', 1, $percentil, true).'
    ".__('Equalize maximum thresholds').''.ui_print_help_tip(__('If an option is selected, all graphs will have the highest value from all modules included in the graph as a maximum threshold'), true); +echo "
    ".__('Equalize maximum thresholds').''; html_print_checkbox('threshold', CUSTOM_GRAPH_BULLET_CHART_THRESHOLD, $check, false, false, '', false); echo '
    ".__('Add summatory series').ui_print_help_tip( - __( - 'Adds synthetic series to the graph, using all module - values to calculate the summation and/or average in each time interval. - This feature could be used instead of synthetic modules if you only want to see a graph.' - ), - true -).'
    ".__('Add summatory series').'".html_print_checkbox('summatory_series', 1, $summatory_series, true)." ".__('Add average series').'".html_print_checkbox('average_series', 1, $average_series, true).'
    ".__('Modules and series').'".html_print_checkbox('modules_series', 1, $modules_series, true).'".__('Show full scale graph (TIP)').ui_print_help_tip(__('This option may cause performance issues'), true).'".html_print_checkbox('fullscale', 1, $fullscale, true).'".__('Show full scale graph (TIP)').'
    '; diff --git a/pandora_console/godmode/reporting/graph_builder.php b/pandora_console/godmode/reporting/graph_builder.php index 7a83697824..23aa4b0771 100644 --- a/pandora_console/godmode/reporting/graph_builder.php +++ b/pandora_console/godmode/reporting/graph_builder.php @@ -296,7 +296,7 @@ switch ($tab) { $head, 'images/chart.png', false, - 'graph_editor', + '', false, $buttons ); diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php index 142216ff45..1a17896383 100644 --- a/pandora_console/godmode/reporting/map_builder.php +++ b/pandora_console/godmode/reporting/map_builder.php @@ -84,7 +84,7 @@ if (!$is_metaconsole) { __('Reporting').' » '.__('Visual Console'), 'images/op_reporting.png', false, - 'map_builder_intro', + '', false, $buttons ); diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index 2bf5a743c8..416004a539 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -1169,10 +1169,7 @@ $class = 'databox filters'; @@ -1190,10 +1187,7 @@ $class = 'databox filters'; diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 60464ee953..9e24684fd9 100755 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -3128,22 +3128,14 @@ if ($enterpriseEnable && defined('METACONSOLE')) { // Print header. ui_meta_print_header(__('Reporting').$textReportName, '', $buttons); } else { - switch ($activeTab) { - case 'main': - $helpers = ''; - break; - - default: - $helpers = 'reporting_'.$activeTab.'_tab'; - break; - } + $tab_builder = ($activeTab === 'item_editor') ? 'reporting_item_editor_tab' : ''; if ($action !== 'update' && !is_metaconsole()) { ui_print_page_header( $textReportName, 'images/op_reporting.png', false, - $helpers, + $tab_builder, false, $buttons, false, diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php index f8f949e77a..775230c471 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.php +++ b/pandora_console/godmode/reporting/visual_console_builder.php @@ -805,12 +805,14 @@ if ($action == 'new' || $idVisualConsole === false) { $buttons[$activeTab]['active'] = true; +$tab_builder = ($activeTab === 'editor') ? 'visual_console_editor_editor_tab' : ''; + if (!defined('METACONSOLE')) { ui_print_page_header( $visualConsoleName, 'images/visual_console.png', false, - 'visual_console_editor_'.$activeTab.'_tab', + $tab_builder, false, $buttons ); diff --git a/pandora_console/godmode/reporting/visual_console_favorite.php b/pandora_console/godmode/reporting/visual_console_favorite.php index 5c5c5adfa1..201fdab148 100644 --- a/pandora_console/godmode/reporting/visual_console_favorite.php +++ b/pandora_console/godmode/reporting/visual_console_favorite.php @@ -78,7 +78,7 @@ if (!$is_metaconsole) { __('Reporting').' » '.__('Visual Favourite Console'), 'images/op_reporting.png', false, - 'map_builder_favorite', + '', false, $buttons ); diff --git a/pandora_console/godmode/servers/discovery.php b/pandora_console/godmode/servers/discovery.php index 3dd8e258ee..67605a6a4b 100755 --- a/pandora_console/godmode/servers/discovery.php +++ b/pandora_console/godmode/servers/discovery.php @@ -59,7 +59,7 @@ function get_wiz_class($str) __('Discovery'), '', false, - 'discovery', + '', true, '', false, diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php index 37c8aac797..cd401b0cc5 100644 --- a/pandora_console/godmode/servers/modificar_server.php +++ b/pandora_console/godmode/servers/modificar_server.php @@ -30,7 +30,7 @@ if (! check_acl($config['id_user'], 0, 'AW')) { if (isset($_GET['server'])) { $id_server = get_parameter_get('server'); - // Headers + // Headers. ui_print_page_header(__('Update Server'), 'images/gm_servers.png', false, 'servers', true); $sql = sprintf('SELECT name, ip_address, description, server_type, exec_proxy, port FROM tserver WHERE id_server = %d', $id_server); $row = db_get_row_sql($sql); @@ -98,16 +98,16 @@ if (isset($_GET['server'])) { echo ''; echo '
    '; } else if (isset($_GET['server_remote'])) { - // Headers + // Headers. $id_server = get_parameter_get('server_remote'); $ext = get_parameter('ext', ''); ui_print_page_header(__('Remote Configuration'), 'images/gm_servers.png', false, 'servers', true); enterprise_include('godmode/servers/server_disk_conf_editor.php'); } else { - // Header - ui_print_page_header(__('%s servers', get_product_name()), 'images/gm_servers.png', false, 'servers', true); + // Header. + ui_print_page_header(__('%s servers', get_product_name()), 'images/gm_servers.png', false, '', true); - // Move SNMP modules back to the enterprise server + // Move SNMP modules back to the enterprise server. if (isset($_GET['server_reset_snmp_enterprise'])) { $result = db_process_sql('UPDATE tagente_estado SET last_error=0'); @@ -118,7 +118,7 @@ if (isset($_GET['server'])) { } } - // Reset module count + // Reset module count. if (isset($_GET['server_reset_counts'])) { $reslt = db_process_sql('UPDATE tagente SET update_module_count=1, update_alert_count=1'); @@ -167,7 +167,7 @@ if (isset($_GET['server'])) { $server_md5 = md5(io_safe_output(servers_get_name($id_server, 'none').$ext), false); if (file_exists($config['remote_config'].'/md5/'.$server_md5.'.srv.md5')) { - // Server remote configuration editor + // Server remote configuration editor. $file_name = $config['remote_config'].'/conf/'.$server_md5.'.srv.conf'; $correct = @unlink($file_name); diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php index fb575c06fb..c32152e12d 100644 --- a/pandora_console/godmode/servers/plugin.php +++ b/pandora_console/godmode/servers/plugin.php @@ -283,7 +283,7 @@ if (($create != '') || ($view != '')) { __('Plugin registration'), 'images/gm_servers.png', false, - 'plugin_definition', + '', true ); } else { @@ -291,7 +291,7 @@ if (($create != '') || ($view != '')) { __('Plugin update'), 'images/gm_servers.png', false, - 'plugin_definition', + '', true ); } @@ -391,7 +391,7 @@ if (($create != '') || ($view != '')) { } $data = []; - $data[0] = __('Plugin command'); + $data[0] = __('Plugin command').ui_print_help_tip(__('Specify interpreter and plugin path. The server needs permissions to run it.'), true); $data[1] = ''; if ($locked) { $data[1] .= html_print_image('images/lock.png', true, ['class' => 'command_advanced_conf lock']); diff --git a/pandora_console/godmode/setup/gis_step_2.php b/pandora_console/godmode/setup/gis_step_2.php index 001baed40f..efe167e914 100644 --- a/pandora_console/godmode/setup/gis_step_2.php +++ b/pandora_console/godmode/setup/gis_step_2.php @@ -44,7 +44,7 @@ switch ($action) { __('Create new map connection'), '', false, - '', + 'map_connection_tab', true, $buttons ); @@ -71,7 +71,7 @@ switch ($action) { __('Edit map connection'), '', false, - '', + 'map_connection_tab', true, $buttons ); @@ -200,20 +200,20 @@ switch ($action) { $table->width = '90%'; $table->data = []; -$table->data[0][0] = __('Connection Name').ui_print_help_tip(__('Descriptive name for the connection'), true).':'; +$table->data[0][0] = __('Connection Name'); $table->data[0][1] = html_print_input_text('name', $mapConnection_name, '', 30, 60, true); -$table->data[1][0] = __('Group').ui_print_help_tip(__('Group that owns the connection'), true).':'; +$table->data[1][0] = __('Group'); $table->data[1][1] = html_print_select_groups(false, false, false, 'group', $mapConnection_group, '', __('All'), '0', true); -$table->data[2][0] = __('Number of zoom levels').':'; +$table->data[2][0] = __('Number of zoom levels'); $table->data[2][1] = html_print_input_text('num_levels_zoom', $mapConnection_numLevelsZoom, '', 4, 10, true); -$table->data[3][0] = __('Default zoom level').ui_print_help_tip(__('Zoom level used when the map is opened'), true).':'; +$table->data[3][0] = __('Default zoom level'); $table->data[3][1] = html_print_input_text('initial_zoom', $mapConnection_defaultZoom, '', 4, 10, true); -echo '

    '.__('Basic configuration').' '.ui_print_help_icon('gis_basic_configurations_tab', true).'

    '; +echo '

    '.__('Basic configuration').'

    '; html_print_table($table); $table->width = '60%'; @@ -222,10 +222,10 @@ $types['OSM'] = __('Open Street Maps'); $types['Gmap'] = __('Google Maps'); $types['Static_Image'] = __('Static Image'); $types['WMS'] = __('WMS Server'); -$table->data[0][0] = __('Type').':'; +$table->data[0][0] = __('Type'); $table->data[0][1] = html_print_select($types, 'sel_type', $mapConnection_type, 'selMapConnectionType();', __('Please select the connection type'), 0, true); -echo '

    '.__('Map connection type').' '.ui_print_help_icon('gis_map_connection_tab', true).'

    '; +echo '

    '.__('Map connection type').'

    '; html_print_table($table); $optionsConnectionTypeTable = ''; @@ -284,7 +284,7 @@ $optionsConnectionGmapTable = ''.''.''.''.''.''.''.''.''.''.''.''.''.''.''.''.''.''.''.''.''.''.''.''.''.''.''.''.'
    '.__('Image URL').':'.html_print_input_text('url', $mapConnectionDataUrl, '', 45, 90, true).'
    '.__('Corners of the area of the image').':
    '.__('Left').':'.html_print_input_text('bb_left', $bb_left, '', 25, 25, true).''.__('Bottom').':'.html_print_input_text('bb_bottom', $bb_bottom, '', 25, 25, true).'
    '.__('Right').':'.html_print_input_text('bb_right', $bb_right, '', 25, 25, true).''.__('Top').':'.html_print_input_text('bb_top', $bb_top, '', 25, 25, true).'
    '.__('Image Size').':
    '.__('Width').':'.html_print_input_text('image_width', $image_width, '', 25, 25, true).''.__('Height').':'.html_print_input_text('image_height', $image_height, '', 25, 25, true).'
    '; // WMS Server Connection. -$optionsConnectionWMSTable = ''.''.''.''.''.''.''.''.''.'
    '.__('WMS Server URL').''.''.html_print_input_text('url', $mapConnectionDataUrl, '', 90, 255, true).'
    '.__('Layers').ui_print_help_tip(__('Enter a single element or a comma separated list'), true).''.html_print_input_text('layers', $layers, '', 90, 255, true).'
    '; +$optionsConnectionWMSTable = ''.''.''.''.''.''.''.''.''.'
    '.__('WMS Server URL').''.''.html_print_input_text('url', $mapConnectionDataUrl, '', 90, 255, true).'
    '.__('Layers').''.html_print_input_text('layers', $layers, '', 90, 255, true).'
    '; if ($mapConnectionData != null) { switch ($mapConnection_type) { @@ -322,22 +322,22 @@ $table->data = []; // $table->colspan[0][3] = 3; $table->data[0][0] = ''; -$table->data[0][1] = __('Map Center').ui_print_help_tip(__('Position to center the map when the map is opened'), true); +$table->data[0][1] = __('Map Center'); $table->data[0][2] = __('Default position for agents without GIS data'); -$table->data[1][0] = __('Change in the map').ui_print_help_tip(__('This selects what to change by clicking on the map'), true); +$table->data[1][0] = __('Change in the map'); $table->data[1][1] = html_print_radio_button_extended('radio_button', 1, '', 1, false, 'changeSetManualPosition(true, false)', '', true); $table->data[1][2] = html_print_radio_button_extended('radio_button', 2, '', 0, false, 'changeSetManualPosition(false, true)', '', true); -$table->data[2][0] = __('Latitude').':'; +$table->data[2][0] = __('Latitude'); $table->data[2][1] = html_print_input_text('center_latitude', $mapConnection_centerLatitude, '', 10, 10, true); $table->data[2][2] = html_print_input_text('default_latitude', $mapConnection_defaultLatitude, '', 10, 10, true); -$table->data[3][0] = __('Longitude').':'; +$table->data[3][0] = __('Longitude'); $table->data[3][1] = html_print_input_text('center_longitude', $mapConnection_centerLongitude, '', 10, 10, true); $table->data[3][2] = html_print_input_text('default_longitude', $mapConnection_defaultLongitude, '', 10, 10, true); -$table->data[4][0] = __('Altitude').':'; +$table->data[4][0] = __('Altitude'); $table->data[4][1] = html_print_input_text('center_altitude', $mapConnection_centerAltitude, '', 10, 10, true); $table->data[4][2] = html_print_input_text('default_altitude', $mapConnection_defaultAltitude, '', 10, 10, true); html_print_table($table); diff --git a/pandora_console/godmode/setup/performance.php b/pandora_console/godmode/setup/performance.php index af414d6ab3..422321ee6e 100644 --- a/pandora_console/godmode/setup/performance.php +++ b/pandora_console/godmode/setup/performance.php @@ -249,10 +249,6 @@ $table->size[1] = '30%'; // enterprise_hook('enterprise_warnings_history_days'); $table->data[1][0] = __('Max. days before delete events'); -$table->data[1][0] .= ui_print_help_tip( - __('If the compaction or purge of the data is more frequent than the events deletion, anomalies in module graphs could appear'), - true -); $table->data[1][1] = html_print_input_text( 'event_purge', @@ -304,10 +300,6 @@ $table->data[5][1] = html_print_input_text( ); $table->data[6][0] = __('Max. days before purge'); -$table->data[6][0] .= ui_print_help_tip( - __('Configure a purge period more frequent than a compact data period has no sense'), - true -); $table->data[6][1] = html_print_input_text( 'days_purge', $config['days_purge'], @@ -348,10 +340,6 @@ $table->data[9][1] = html_print_input_text( ); $table->data[10][0] = __('Retention period of past special days'); -$table->data[10][0] .= ui_print_help_tip( - __('This number is days to keep past special days. 0 means never remove.'), - true -); $table->data[10][1] = html_print_input_text( 'num_past_special_days', $config['num_past_special_days'], @@ -362,10 +350,6 @@ $table->data[10][1] = html_print_input_text( ); $table->data[11][0] = __('Max. macro data fields'); -$table->data[11][0] .= ui_print_help_tip( - __('Number of macro fields in alerts and templates between 1 and 15'), - true -); $table->data[11][1] = html_print_input_text( 'max_macro_fields', $config['max_macro_fields'], @@ -454,10 +438,6 @@ if ($config['history_db_enabled'] == 1) { enterprise_hook('enterprise_warnings_history_days'); $table_historical->data[0][0] = __('Max. days before purge'); - $table_historical->data[0][0] .= ui_print_help_tip( - __('Configure a purge period more frequent than a compact data period has no sense'), - true - ); $table_historical->data[0][1] = html_print_input_text( 'historical_days_purge', $config_history['days_purge'], @@ -478,10 +458,6 @@ if ($config['history_db_enabled'] == 1) { ); $table_historical->data[2][0] = __('Compact interpolation in hours (1 Fine-20 bad)'); - $table_historical->data[2][0] .= ui_print_help_tip( - __('Data will be compacted in intervals of the specified length.'), - true - ); $table_historical->data[2][1] = html_print_input_text( 'historical_step_compact', $config_history['step_compact'], @@ -492,11 +468,6 @@ if ($config['history_db_enabled'] == 1) { ); $table_historical->data[3][0] = __('Max. days before delete events'); - $table_historical->data[3][0] .= ui_print_help_tip( - __('If the compaction or purge of the data is more frequent than the events deletion, anomalies in module graphs could appear'), - true - ); - $table_historical->data[3][1] = html_print_input_text( 'historical_event_purge', $config_history['event_purge'], @@ -558,10 +529,6 @@ $table_other->size[0] = '70%'; $table_other->size[1] = '30%'; $table_other->data[1][0] = __('Item limit for realtime reports'); -$table_other->data[1][0] .= ui_print_help_tip( - __('Set a value too high cause a slowdown on console and a performance penalty in the system.'), - true -); $table_other->data[1][1] = html_print_input_text( 'report_limit', $config['report_limit'], @@ -572,10 +539,6 @@ $table_other->data[1][1] = html_print_input_text( ); $table_other->data[2][0] = __('Compact interpolation in hours (1 Fine-20 bad)'); -$table_other->data[2][0] .= ui_print_help_tip( - __('Data will be compacted in intervals of the specified length.'), - true -); $table_other->data[2][1] = html_print_input_text( 'step_compact', $config['step_compact'], @@ -614,10 +577,6 @@ $table_other->data[5][1] = html_print_checkbox_switch( ); $table_other->data[6][0] = __('Batch statistics period (secs)'); -$table_other->data[6][0] .= ui_print_help_tip( - __('If realtime statistics are disabled, statistics interval resfresh will be set here.'), - true -); $table_other->data[6][1] = html_print_input_text( 'stats_interval', $config['stats_interval'], @@ -631,10 +590,6 @@ $table_other->data[7][0] = __('Use agent access graph'); $table_other->data[7][1] = html_print_checkbox_switch('agentaccess', 1, $config['agentaccess'], true); $table_other->data[8][0] = __('Max. recommended number of files in attachment directory'); -$table_other->data[8][0] .= ui_print_help_tip( - __('This number is the maximum number of files in attachment directory. If this number is reached then a warning message will appear in the header notification space.'), - true -); $table_other->data[8][1] = html_print_input_text( 'num_files_attachment', $config['num_files_attachment'], @@ -648,10 +603,6 @@ $table_other->data[9][0] = __('Delete not init modules'); $table_other->data[9][1] = html_print_checkbox_switch('delete_notinit', 1, $config['delete_notinit'], true); $table_other->data[10][0] = __('Big Operation Step to purge old data'); -$table_other->data[10][0] .= ui_print_help_tip( - __('The number of blocks that a time interval is split into. A bigger value means bigger blocks, which is faster but heavier on the database. Default is 100.'), - true -); $table_other->data[10][1] = html_print_input_text( 'big_operation_step_datos_purge', $config['big_operation_step_datos_purge'], @@ -662,10 +613,6 @@ $table_other->data[10][1] = html_print_input_text( ); $table_other->data[11][0] = __('Small Operation Step to purge old data'); -$table_other->data[11][0] .= ui_print_help_tip( - __('The number of rows that are processed in a single query in deletion. Default is 1000. Increase to 3000-5000 in fast systems. Decrease to 500 or 250 on systems with locks.'), - true -); $table_other->data[11][1] = html_print_input_text( 'small_operation_step_datos_purge', $config['small_operation_step_datos_purge'], @@ -676,10 +623,6 @@ $table_other->data[11][1] = html_print_input_text( ); $table_other->data[12][0] = __('Graph container - Max. Items'); -$table_other->data[12][0] .= ui_print_help_tip( - __('The number of graphs that are viewed in a container. Default is 10 .Increasing this number could lead to performance problems'), - true -); $table_other->data[12][1] = html_print_input_text( 'max_graph_container', $config['max_graph_container'], @@ -690,10 +633,6 @@ $table_other->data[12][1] = html_print_input_text( ); $table_other->data[13][0] = __('Events response max. execution'); -$table_other->data[13][0] .= ui_print_help_tip( - __('Number of events that will perform the desired action at the same time'), - true -); $table_other->data[13][1] = html_print_input_text( 'max_execution_event_response', $config['max_execution_event_response'], diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php index 815410b3c3..9e4fb13a9c 100644 --- a/pandora_console/godmode/setup/setup.php +++ b/pandora_console/godmode/setup/setup.php @@ -183,6 +183,7 @@ switch ($section) { case 'net': $buttons['net']['active'] = true; $subpage = ' » '.__('Netflow'); + $help_header = 'setup_netflow_tab'; break; case 'ehorus': diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php index 53fe7059f8..db436224c3 100644 --- a/pandora_console/godmode/setup/setup_auth.php +++ b/pandora_console/godmode/setup/setup_auth.php @@ -50,10 +50,7 @@ if (is_ajax()) { if ($type_auth != 'mysql') { // Fallback to local authentication. $row = []; - $row['name'] = __('Fallback to local authentication').ui_print_help_tip( - __('Enable this option if you want to fallback to local authentication when remote (ldap etc...) authentication failed. Only available when \'Save password\' is enabled.'), - true - ); + $row['name'] = __('Fallback to local authentication'); $row['control'] = html_print_checkbox_switch( 'fallback_local_auth', 1, @@ -215,10 +212,7 @@ if (is_ajax()) { // Set default value. set_unless_defined($config['double_auth_enabled'], false); $row = []; - $row['name'] = __('Double authentication').ui_print_help_tip( - __('If this option is enabled, the users can use double authentication with their accounts'), - true - ); + $row['name'] = __('Double authentication'); $row['control'] .= html_print_checkbox_switch( 'double_auth_enabled', 1, @@ -231,10 +225,7 @@ if (is_ajax()) { // Default session timeout. set_when_empty($config['session_timeout'], 90); $row = []; - $row['name'] = __('Session timeout (mins)').ui_print_help_tip( - __('This is defined in minutes, If you wish a permanent session should putting -1 in this field.'), - true - ); + $row['name'] = __('Session timeout (mins)'); $row['control'] = html_print_input_text( 'session_timeout', $config['session_timeout'], diff --git a/pandora_console/godmode/setup/setup_ehorus.php b/pandora_console/godmode/setup/setup_ehorus.php index 89d4ff35e8..1c3650418b 100644 --- a/pandora_console/godmode/setup/setup_ehorus.php +++ b/pandora_console/godmode/setup/setup_ehorus.php @@ -88,21 +88,18 @@ $table_remote->data['ehorus_pass'] = $row; $row = []; $row['name'] = __('API Hostname'); $row['control'] = html_print_input_text('ehorus_hostname', $config['ehorus_hostname'], '', 30, 100, true); -$row['control'] .= ui_print_help_tip(__('Hostname of the eHorus API').'. '.__('Without protocol and port').'. '.__('e.g., portal.ehorus.com'), true); $table_remote->data['ehorus_hostname'] = $row; // Directory port. $row = []; $row['name'] = __('API Port'); $row['control'] = html_print_input_text('ehorus_port', $config['ehorus_port'], '', 6, 100, true); -$row['control'] .= ui_print_help_tip(__('e.g., 18080'), true); $table_remote->data['ehorus_port'] = $row; // Request timeout. $row = []; $row['name'] = __('Request timeout'); $row['control'] = html_print_input_text('ehorus_req_timeout', $config['ehorus_req_timeout'], '', 3, 10, true); -$row['control'] .= ui_print_help_tip(__('Time in seconds to set the maximum time of the requests to the eHorus API').'. '.__('0 to disable'), true); $table_remote->data['ehorus_req_timeout'] = $row; // Test. diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php index def984d6af..d28a5e43fe 100644 --- a/pandora_console/godmode/setup/setup_general.php +++ b/pandora_console/godmode/setup/setup_general.php @@ -117,10 +117,10 @@ $table->data[$i++][1] = html_print_select_from_sql( true ); -$table->data[$i][0] = __('Remote config directory').ui_print_help_tip(__('Directory where agent remote configuration is stored.'), true); +$table->data[$i][0] = __('Remote config directory'); $table->data[$i++][1] = html_print_input_text('remote_config', io_safe_output($config['remote_config']), '', 30, 100, true); -$table->data[$i][0] = __('Phantomjs bin directory').ui_print_help_tip(__('Directory where phantomjs binary file exists and has execution grants.'), true); +$table->data[$i][0] = __('Phantomjs bin directory'); $table->data[$i++][1] = html_print_input_text('phantomjs_bin', io_safe_output($config['phantomjs_bin']), '', 30, 100, true); $table->data[$i][0] = __('Auto login (hash) password'); @@ -146,10 +146,10 @@ $table->data[$i++][1] = html_print_checkbox_switch_extended('use_cert', 1, $conf $table->rowstyle[$i] = 'display: none;'; $table->rowid[$i] = 'ssl-path-tr'; -$table->data[$i][0] = __('Path of SSL Cert.').ui_print_help_tip(__('Path where you put your cert and name of this cert. Remember your cert only in .pem extension.'), true); +$table->data[$i][0] = __('Path of SSL Cert.'); $table->data[$i++][1] = html_print_input_text('cert_path', io_safe_output($config['cert_path']), '', 50, 255, true); -$table->data[$i][0] = __('Attachment store').ui_print_help_tip(__('Directory where temporary data is stored.'), true); +$table->data[$i][0] = __('Attachment store'); $table->data[$i++][1] = html_print_input_text('attachment_store', io_safe_output($config['attachment_store']), '', 50, 255, true); $table->data[$i][0] = __('IP list with API access'); @@ -161,7 +161,7 @@ if (isset($_POST['list_ACL_IPs_for_API'])) { $table->data[$i++][1] = html_print_textarea('list_ACL_IPs_for_API', 2, 25, $list_ACL_IPs_for_API, 'style="height: 50px; width: 300px"', true); -$table->data[$i][0] = __('API password').ui_print_help_tip(__('Please be careful if you put a password put https access.'), true); +$table->data[$i][0] = __('API password'); $table->data[$i++][1] = html_print_input_password('api_password', io_output_password($config['api_password']), '', 25, 255, true); $table->data[$i][0] = __('Enable GIS features'); @@ -171,7 +171,6 @@ $table->data[$i][0] = __('Enable Netflow'); $rbt_disabled = false; if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { $rbt_disabled = true; - $table->data[$i][0] .= ui_print_help_tip(__('Not supported in Windows systems'), true); } $table->data[$i++][1] = html_print_checkbox_switch_extended('activate_netflow', 1, $config['activate_netflow'], $rbt_disabled, '', '', true); @@ -216,10 +215,7 @@ foreach ($timezones as $timezone) { } } -$table->data[$i][0] = __('Timezone setup').' '.ui_print_help_tip( - __('Must have the same time zone as the system or database to avoid mismatches of time.'), - true -); +$table->data[$i][0] = __('Timezone setup'); $table->data[$i][1] = html_print_input_text_extended( 'timezone_text', $config['timezone'], @@ -253,14 +249,9 @@ $table->data[$i][1] .= ' '.html $table->data[$i++][1] .= '
    '; $table->data[$i][0] = __('Public URL'); -$table->data[$i][0] .= ui_print_help_tip( - __('Set this value when your %s across inverse proxy or for example with mod_proxy of Apache.', get_product_name()).' '.__('Without the index.php such as http://domain/console_url/'), - true -); $table->data[$i++][1] = html_print_input_text('public_url', $config['public_url'], '', 40, 255, true); $table->data[$i][0] = __('Force use Public URL'); -$table->data[$i][0] .= ui_print_help_tip(__('Force using defined public URL).', get_product_name()), true); $table->data[$i++][1] = html_print_switch( [ 'name' => 'force_public_url', @@ -276,18 +267,16 @@ $table->data[$i][0] = __('Public URL host exclusions'); $table->data[$i++][1] = html_print_textarea('public_url_exclusions', 2, 25, $config['public_url_exclusions'], 'style="height: 50px; width: 300px"', true); $table->data[$i][0] = __('Referer security'); -$table->data[$i][0] .= ui_print_help_tip(__("If enabled, actively checks if the user comes from %s's URL", get_product_name()), true); $table->data[$i++][1] = html_print_checkbox_switch('referer_security', 1, $config['referer_security'], true); $table->data[$i][0] = __('Event storm protection'); -$table->data[$i][0] .= ui_print_help_tip(__('If set to yes no events or alerts will be generated, but agents will continue receiving data.'), true); $table->data[$i++][1] = html_print_checkbox_switch('event_storm_protection', 1, $config['event_storm_protection'], true); -$table->data[$i][0] = __('Command Snapshot').ui_print_help_tip(__('The string modules with several lines show as command output'), true); +$table->data[$i][0] = __('Command Snapshot'); $table->data[$i++][1] = html_print_checkbox_switch('command_snapshot', 1, $config['command_snapshot'], true); -$table->data[$i][0] = __('Server logs directory').ui_print_help_tip(__('Directory where the server logs are stored.'), true); +$table->data[$i][0] = __('Server logs directory'); $table->data[$i++][1] = html_print_input_text( 'server_log_dir', $config['server_log_dir'], @@ -297,7 +286,7 @@ $table->data[$i++][1] = html_print_input_text( true ); -$table->data[$i][0] = __('Log size limit in system logs viewer extension').ui_print_help_tip(__('Max size (in bytes) for the logs to be shown.'), true); +$table->data[$i][0] = __('Log size limit in system logs viewer extension'); $table->data[$i++][1] = html_print_input_text( 'max_log_size', $config['max_log_size'], @@ -312,7 +301,7 @@ $modes_tutorial = [ 'on_demand' => __('On demand'), 'expert' => __('Expert'), ]; -$table->data[$i][0] = __('Tutorial mode').ui_print_help_tip(__("Configuration of our clippy, 'full mode' show the icon in the header and the contextual helps and it is noise, 'on demand' it is equal to full but it is not noise and 'expert' the icons in the header and the context is not."), true); +$table->data[$i][0] = __('Tutorial mode'); $table->data[$i++][1] = html_print_select( $modes_tutorial, 'tutorial_mode', @@ -324,10 +313,10 @@ $table->data[$i++][1] = html_print_select( ); $config['past_planned_downtimes'] = isset($config['past_planned_downtimes']) ? $config['past_planned_downtimes'] : 1; -$table->data[$i][0] = __('Allow create planned downtimes in the past').ui_print_help_tip(__('The planned downtimes created in the past will affect the SLA reports'), true); +$table->data[$i][0] = __('Allow create planned downtimes in the past'); $table->data[$i++][1] = html_print_checkbox_switch('past_planned_downtimes', 1, $config['past_planned_downtimes'], true); -$table->data[$i][0] = __('Limit for bulk operations').ui_print_help_tip(__('Your PHP environment is set to 1000 max_input_vars. This parameter should have the same value or lower.', ini_get('max_input_vars')), true); +$table->data[$i][0] = __('Limit for bulk operations'); $table->data[$i++][1] = html_print_input_text( 'limit_parameters_massive', $config['limit_parameters_massive'], @@ -340,13 +329,13 @@ $table->data[$i++][1] = html_print_input_text( $table->data[$i][0] = __('Include agents manually disabled'); $table->data[$i++][1] = html_print_checkbox_switch('include_agents', 1, $config['include_agents'], true); -$table->data[$i][0] = __('Audit log directory').ui_print_help_tip(__('Directory where audit log is stored.'), true); +$table->data[$i][0] = __('Audit log directory'); $table->data[$i++][1] = html_print_input_text('auditdir', io_safe_output($config['auditdir']), '', 30, 100, true); $table->data[$i][0] = __('Set alias as name by default in agent creation'); $table->data[$i++][1] = html_print_checkbox_switch('alias_as_name', 1, $config['alias_as_name'], true); -$table->data[$i][0] = __('Unique IP').ui_print_help_tip(__('Set the primary IP address as the unique IP, preventing the same primary IP address from being used in more than one agent'), true); +$table->data[$i][0] = __('Unique IP'); $table->data[$i++][1] = html_print_checkbox_switch('unique_ip', 1, $config['unique_ip'], true); echo '
    '; @@ -392,7 +381,7 @@ $table_mail_conf->data[6][1] = html_print_input_password('email_password', io_ou $uniqid = uniqid(); -$table_mail_conf->data[7][0] = html_print_button(__('Email test'), 'email_test_dialog', false, "show_email_test('$uniqid');", 'class="sub next"', true).ui_print_help_tip(__('Check the current saved email configuration by sending a test email to a desired account.'), true); +$table_mail_conf->data[7][0] = html_print_button(__('Email test'), 'email_test_dialog', false, "show_email_test('$uniqid');", 'class="sub next"', true); print_email_test_modal_window($uniqid); @@ -420,7 +409,7 @@ function print_email_test_modal_window($id) $table_mail_test->style[0] = 'font-weight: bold'; $table_mail_test->colspan[1][0] = 2; - $table_mail_test->data[0][0] = __('Address').ui_print_help_tip(__('Email address to which the test email will be sent. Please check your inbox after email is sent.'), true); + $table_mail_test->data[0][0] = __('Address'); $table_mail_test->data[0][1] = html_print_input_text('email_test_address', '', '', 40, 100, true); $table_mail_test->data[1][0] = html_print_button(__('Send'), 'email_test', false, '', 'class="sub next"', true).'  '; diff --git a/pandora_console/godmode/setup/setup_integria.php b/pandora_console/godmode/setup/setup_integria.php index 3ce6cf334c..e172dda50b 100644 --- a/pandora_console/godmode/setup/setup_integria.php +++ b/pandora_console/godmode/setup/setup_integria.php @@ -227,21 +227,18 @@ $table_remote->data['integria_pass'] = $row; $row = []; $row['name'] = __('API Hostname'); $row['control'] = html_print_input_text('integria_hostname', $config['integria_hostname'], '', 30, 100, true); -$row['control'] .= ui_print_help_tip(__('Hostname of Integria IMS\' API (scheme must be specified. Example: http://192.168.0.0)'), true); $table_remote->data['integria_hostname'] = $row; // API password. $row = []; $row['name'] = __('API Password'); $row['control'] = html_print_input_password('integria_api_pass', io_output_password($config['integria_api_pass']), '', 30, 100, true); -$row['control'] .= ui_print_help_tip(__('Password of Integria IMS\' API'), true); $table_remote->data['integria_api_pass'] = $row; // Request timeout. $row = []; $row['name'] = __('Request timeout'); $row['control'] = html_print_input_text('integria_req_timeout', $config['integria_req_timeout'], '', 3, 10, true); -$row['control'] .= ui_print_help_tip(__('Time in seconds to set the maximum time of the requests to the Integria API').'. '.__('0 to disable'), true); $table_remote->data['integria_req_timeout'] = $row; // Alert settings. diff --git a/pandora_console/godmode/setup/setup_netflow.php b/pandora_console/godmode/setup/setup_netflow.php index 0b2cddbc25..87b8d732d2 100644 --- a/pandora_console/godmode/setup/setup_netflow.php +++ b/pandora_console/godmode/setup/setup_netflow.php @@ -43,10 +43,10 @@ $table->class = 'databox filters'; $table->data = []; -$table->data[0][0] = ''.__('Data storage path').''.ui_print_help_tip(__('Directory where netflow data will be stored.'), true); +$table->data[0][0] = ''.__('Data storage path').''; $table->data[0][1] = html_print_input_text('netflow_path', $config['netflow_path'], false, 50, 200, true); -$table->data[1][0] = ''.__('Daemon interval').''.ui_print_help_tip(__('Specifies the time interval in seconds to rotate netflow data files.'), true); +$table->data[1][0] = ''.__('Daemon interval').''; $table->data[1][1] = html_print_input_text('netflow_interval', $config['netflow_interval'], false, 50, 200, true); $table->data[2][0] = ''.__('Daemon binary path').''; @@ -58,15 +58,15 @@ $table->data[3][1] = html_print_input_text('netflow_nfdump', $config['netflow_nf $table->data[4][0] = ''.__('Nfexpire binary path').''; $table->data[4][1] = html_print_input_text('netflow_nfexpire', $config['netflow_nfexpire'], false, 50, 200, true); -$table->data[5][0] = ''.__('Maximum chart resolution').''.ui_print_help_tip(__('Maximum number of points that a netflow area chart will display. The higher the resolution the performance. Values between 50 and 100 are recommended.'), true); +$table->data[5][0] = ''.__('Maximum chart resolution').''; $table->data[5][1] = html_print_input_text('netflow_max_resolution', $config['netflow_max_resolution'], false, 50, 200, true); -$table->data[6][0] = ''.__('Disable custom live view filters').''.ui_print_help_tip(__('Disable the definition of custom filters in the live view. Only existing filters can be used.'), true); +$table->data[6][0] = ''.__('Disable custom live view filters').''; $table->data[6][1] = html_print_checkbox_switch('netflow_disable_custom_lvfilters', 1, $config['netflow_disable_custom_lvfilters'], true); -$table->data[7][0] = ''.__('Netflow max lifetime').''.ui_print_help_tip(__('Sets the maximum lifetime for netflow data in days.'), true); +$table->data[7][0] = ''.__('Netflow max lifetime').''; $table->data[7][1] = html_print_input_text('netflow_max_lifetime', $config['netflow_max_lifetime'], false, 50, 200, true); -$table->data[8][0] = ''.__('Name resolution for IP address').''.ui_print_help_tip(__('Resolve the IP addresses to get their hostnames.'), true); +$table->data[8][0] = ''.__('Name resolution for IP address').''; $onclick = "if (!confirm('".__('Warning').'. '.__('IP address resolution can take a lot of time')."')) return false;"; $table->data[8][1] = html_print_checkbox_switch_extended('netflow_get_ip_hostname', 1, $config['netflow_get_ip_hostname'], false, $onclick, '', true); diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index 58e31d7edd..0631a04903 100755 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -97,7 +97,7 @@ $table_behaviour->data[$row][1] = html_print_input_text('render_proc_fail', $con $row++; // Daniel maya 02/06/2016 Display menu with click --INI -$table_behaviour->data[$row][0] = __('Click to display lateral menus').ui_print_help_tip(__('When enabled, the lateral menus are shown when left clicking them, instead of hovering over them'), true); +$table_behaviour->data[$row][0] = __('Click to display lateral menus'); $table_behaviour->data[$row][1] = html_print_checkbox_switch( 'click_display', 1, @@ -111,7 +111,7 @@ if (enterprise_installed()) { $table_behaviour->data[$row][1] = html_print_input_text('service_label_font_size', $config['service_label_font_size'], '', 5, 5, true); $row++; - $table_behaviour->data[$row][0] = __('Space between items in Service maps').ui_print_help_tip(__('It must be bigger than 80'), true); + $table_behaviour->data[$row][0] = __('Space between items in Service maps'); $table_behaviour->data[$row][1] = html_print_input_text('service_item_padding_size', $config['service_item_padding_size'], '', 5, 5, true, false, false, 'onChange="change_servicetree_nodes_padding()"'); $row++; } @@ -159,7 +159,7 @@ $table_styles->data[$row][1] = html_print_select( $table_styles->data[$row][1] .= ' '.html_print_button(__('View'), 'status_set_preview', false, '', 'class="sub camera logo_preview"', true); $row++; -// Divs to show icon status Colours (Default) +// Divs to show icon status Colours (Default). $icon_unknown_ball = ui_print_status_image(STATUS_AGENT_UNKNOWN_BALL, '', true); $icon_unknown = ui_print_status_image(STATUS_AGENT_UNKNOWN, '', true); $icon_ok_ball = ui_print_status_image(STATUS_AGENT_OK_BALL, '', true); @@ -168,8 +168,8 @@ $icon_warning_ball = ui_print_status_image(STATUS_AGENT_WARNING_BALL, '', true); $icon_warning = ui_print_status_image(STATUS_AGENT_WARNING, '', true); $icon_bad_ball = ui_print_status_image(STATUS_AGENT_CRITICAL_BALL, '', true); $icon_bad = ui_print_status_image(STATUS_AGENT_CRITICAL, '', true); -// End - Divs to show icon status Colours (Default) -$table_styles->data[$row][0] = __('Login background').ui_print_help_tip(__('You can place your custom images into the folder images/backgrounds/'), true); +// End - Divs to show icon status Colours (Default). +$table_styles->data[$row][0] = __('Login background'); $backgrounds_list_jpg = list_files('images/backgrounds', 'jpg', 1, 0); $backgrounds_list_gif = list_files('images/backgrounds', 'gif', 1, 0); $backgrounds_list_png = list_files('images/backgrounds', 'png', 1, 0); @@ -181,10 +181,9 @@ if (!enterprise_installed()) { $open = true; } -// Custom favicon +// Custom favicon. $files = list_files('images/custom_favicon', 'ico', 1, 0); $table_styles->data[$row][0] = __('Custom favicon'); -$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your favicon into the folder images/custom_favicon/. This file should be in .ico format with a size of 16x16.'), true); $table_styles->data[$row][1] = html_print_select( $files, 'custom_favicon', @@ -383,12 +382,11 @@ if (enterprise_installed()) { } if (enterprise_installed()) { - // Get all the custom logos + // Get all the custom logos. $files = list_files('enterprise/images/custom_general_logos', 'png', 1, 0); - // Custom docs icon + // Custom docs icon. $table_styles->data[$row][0] = __('Custom documentation logo'); - $table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true); $table_styles->data[$row][1] = html_print_select( $files, @@ -407,9 +405,8 @@ if (enterprise_installed()) { $table_styles->data[$row][1] .= ' '.html_print_button(__('View'), 'custom_docs_logo_preview', $open, '', 'class="sub camera logo_preview"', true, false, $open, 'visualmodal'); $row++; - // Custom support icon + // Custom support icon. $table_styles->data[$row][0] = __('Custom support logo'); - $table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true); $table_styles->data[$row][1] = html_print_select( $files, 'custom_support_logo', @@ -427,9 +424,8 @@ if (enterprise_installed()) { $table_styles->data[$row][1] .= ' '.html_print_button(__('View'), 'custom_support_logo_preview', $open, '', 'class="sub camera logo_preview"', true, false, $open, 'visualmodal'); $row++; - // Custom center networkmap icon + // Custom center networkmap icon. $table_styles->data[$row][0] = __('Custom networkmap center logo'); - $table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true); $table_styles->data[$row][1] = html_print_select( $files, 'custom_network_center_logo', @@ -447,9 +443,8 @@ if (enterprise_installed()) { $table_styles->data[$row][1] .= ' '.html_print_button(__('View'), 'custom_network_center_logo_preview', $open, '', 'class="sub camera logo_preview"', true, false, $open, 'visualmodal'); $row++; - // Custom center mobile console icon + // Custom center mobile console icon. $table_styles->data[$row][0] = __('Custom mobile console icon'); - $table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true); $table_styles->data[$row][1] = html_print_select( $files, 'custom_mobile_console_logo', @@ -589,7 +584,7 @@ $row++; $table_gis->size[0] = '50%'; $table_gis->data = []; - $table_gis->data[$row][0] = __('GIS Labels').ui_print_help_tip(__('This enabling this, you get a label with agent name in GIS maps. If you have lots of agents in the map, will be unreadable. Disabled by default.'), true); + $table_gis->data[$row][0] = __('GIS Labels'); $table_gis->data[$row][1] = html_print_checkbox_switch( 'gis_label', 1, @@ -604,7 +599,7 @@ $row++; $arraySelectIcon[$index] = $index; } - $table_gis->data[$row][0] = __('Default icon in GIS').ui_print_help_tip(__('Agent icon for GIS Maps. If set to "none", group icon will be used'), true); + $table_gis->data[$row][0] = __('Default icon in GIS'); $table_gis->data[$row][1] = html_print_select( $arraySelectIcon, 'gis_default_icon', @@ -693,21 +688,21 @@ $row++; ); $row++; - $table_font->data[$row][0] = __('Agent size text').ui_print_help_tip(__('When the agent name has a lot of characters, it is needed to truncate it into N characters in some sections in %s Console', get_product_name()), true); + $table_font->data[$row][0] = __('Agent size text'); $table_font->data[$row][1] = __('Small:').html_print_input_text('agent_size_text_small', $config['agent_size_text_small'], '', 3, 3, true); $table_font->data[$row][1] .= ' '.__('Normal:').html_print_input_text('agent_size_text_medium', $config['agent_size_text_medium'], '', 3, 3, true); $row++; - $table_font->data[$row][0] = __('Module size text').ui_print_help_tip(__('When the module name has a lot of characters, it is needed to truncate it into N characters in some sections in %s Console', get_product_name()), true); + $table_font->data[$row][0] = __('Module size text'); $table_font->data[$row][1] = __('Small:').html_print_input_text('module_size_text_small', $config['module_size_text_small'], '', 3, 3, true); $table_font->data[$row][1] .= ' '.__('Normal:').html_print_input_text('module_size_text_medium', $config['module_size_text_medium'], '', 3, 3, true); $row++; - $table_font->data[$row][0] = __('Description size text').ui_print_help_tip(__('If the description name has a lot of characters, in some places in %s Console it is necessary to truncate it to N characters.', get_product_name()), true); + $table_font->data[$row][0] = __('Description size text'); $table_font->data[$row][1] = html_print_input_text('description_size_text', $config['description_size_text'], '', 3, 3, true); $row++; - $table_font->data[$row][0] = __('Item title size text').ui_print_help_tip(__('When the item title name has a lot of characters, it is needed to truncate it into N characters in some sections in %s Console.', get_product_name()), true); + $table_font->data[$row][0] = __('Item title size text'); $table_font->data[$row][1] = html_print_input_text( 'item_title_size_text', $config['item_title_size_text'], @@ -718,7 +713,7 @@ $row++; ); $row++; - $table_font->data[$row][0] = __('Show unit along with value in reports').ui_print_help_tip(__('This enabling this, max, min and avg values will be shown with units.'), true); + $table_font->data[$row][0] = __('Show unit along with value in reports'); $table_font->data[$row][1] = html_print_checkbox_switch( 'simple_module_value', 1, @@ -792,7 +787,6 @@ $row++; } $table_chars->data[$row][0] = __('Data precision'); - $table_chars->data[$row][0] .= ui_print_help_tip(__('Number of decimals shown. It must be a number between 0 and 5, except in graphs.'), true); $table_chars->data[$row][1] = html_print_input_text('graph_precision', $config['graph_precision'], '', 5, 5, true, $disabled_graph_precision, false, 'onChange="change_precision()"'); $row++; @@ -801,7 +795,6 @@ $row++; } $table_chars->data[$row][0] = __('Data precision in graphs'); - $table_chars->data[$row][0] .= ui_print_help_tip(__('Number of decimals shown. If the field is empty, it will show all the decimals'), true); $table_chars->data[$row][1] = html_print_input_text('short_module_graph_data', $config['short_module_graph_data'], '', 5, 5, true, $disabled_graph_precision, false, 'onChange="change_precision()"'); $row++; @@ -860,12 +853,10 @@ $row++; $row++; $table_chars->data[$row][0] = __('Percentile'); - $table_chars->data[$row][0] .= ui_print_help_tip(__('Show percentile 95 in graphs'), true); $table_chars->data[$row][1] = html_print_input_text('percentil', $config['percentil'], '', 20, 20, true); $row++; $table_chars->data[$row][0] = __('Graph TIP view:'); - $table_chars->data[$row][0] .= ui_print_help_tip(__('This option may cause performance issues'), true); $options_full_escale = []; $options_full_escale[0] = __('None'); @@ -877,7 +868,6 @@ $row++; $table_chars->data[$row][0] = __('Show only average'); - $table_chars->data[$row][0] .= ui_print_help_tip(__('If enabled, the module graphs will only show the average value, otherwise it will show three sets of data showing maximums, averages and minimums.'), true); $options_soft_graphs = []; $options_soft_graphs[0] = __('Standard mode'); @@ -924,10 +914,6 @@ $row++; // Remove when the new view reaches rock solid stability. $table_vc->data[$row][0] = __('Legacy Visual Console View'); - $table_vc->data[$row][0] .= ui_print_help_tip( - __('To use the old view when using the Visual Console visor'), - true - ); $table_vc->data[$row][1] = html_print_checkbox_switch( 'legacy_vc', 1, @@ -962,21 +948,21 @@ $row++; ); $row++; - $table_vc->data[$row][0] = __('Default interval for refresh on Visual Console').ui_print_help_tip(__('This interval will affect to Visual Console pages'), true); + $table_vc->data[$row][0] = __('Default interval for refresh on Visual Console'); $table_vc->data[$row][1] = html_print_select($values, 'vc_refr', (int) $config['vc_refr'], '', 'N/A', 0, true, false, false); $row++; $vc_favourite_view_array[0] = __('Classic view'); $vc_favourite_view_array[1] = __('View of favorites'); - $table_vc->data[$row][0] = __('Type of view of visual consoles').ui_print_help_tip(__('Allows you to directly display the list of favorite visual consoles'), true); + $table_vc->data[$row][0] = __('Type of view of visual consoles'); $table_vc->data[$row][1] = html_print_select($vc_favourite_view_array, 'vc_favourite_view', $config['vc_favourite_view'], '', '', 0, true); $row++; - $table_vc->data[$row][0] = __('Number of favorite visual consoles to show in the menu').ui_print_help_tip(__('If the number is 0 it will not show the pull-down menu and maximum 25 favorite consoles'), true); + $table_vc->data[$row][0] = __('Number of favorite visual consoles to show in the menu'); $table_vc->data[$row][1] = ""; $row++; - $table_vc->data[$row][0] = __('Default line thickness for the Visual Console').ui_print_help_tip(__('This interval will affect to the lines between elements on the Visual Console'), true); + $table_vc->data[$row][0] = __('Default line thickness for the Visual Console'); $table_vc->data[$row][1] = html_print_input_text('vc_line_thickness', (int) $config['vc_line_thickness'], '', 5, 5, true); @@ -995,7 +981,7 @@ $row++; $table_ser->size[0] = '50%'; $table_ser->data = []; - $table_ser->data['number'][0] = __('Number of favorite services to show in the menu').ui_print_help_tip(__('If the number is 0 it will not show the pull-down menu and maximum 25 favorite services'), true); + $table_ser->data['number'][0] = __('Number of favorite services to show in the menu'); $table_ser->data['number'][1] = ""; echo '
    '; @@ -1014,10 +1000,7 @@ $row++; $table_report->data = []; - $table_report->data[$row][0] = __('Show report info with description').ui_print_help_tip( - __('Custom report description info. It will be applied to all reports and templates by default.'), - true - ); + $table_report->data[$row][0] = __('Show report info with description'); $table_report->data[$row][1] = html_print_checkbox_switch( 'custom_report_info', 1, @@ -1026,10 +1009,7 @@ $row++; ); $row++; - $table_report->data[$row][0] = __('Custom report front page').ui_print_help_tip( - __('Custom report front page. It will be applied to all reports and templates by default.'), - true - ); + $table_report->data[$row][0] = __('Custom report front page'); $table_report->data[$row][1] = html_print_checkbox_switch( 'custom_report_front', 1, @@ -1064,10 +1044,6 @@ $row++; $table_report->data[$row][0] = __('Graph image height for HTML reports'); - $table_report->data[$row][0] .= ui_print_help_tip( - __('This is the height in pixels of the module graph or custom graph in the reports (only: HTML)'), - true - ); $table_report->data[$row][1] = html_print_input_text('graph_image_height', $config['graph_image_height'], '', 20, 20, true); $row++; @@ -1077,10 +1053,6 @@ $row++; 'tiny' => 'Short', ]; $table_report->data[$row][0] = __('Interval description'); - $table_report->data[$row][0] .= ui_print_help_tip( - __('A long interval description is for example 10 hours, 20 minutes 33 seconds”, a short one is 10h 20m 33s'), - true - ); $table_report->data[$row][1] = html_print_select($interval_description, 'interval_description', $config['interval_description'], '', '', '', true, false, false); $row++; @@ -1094,10 +1066,7 @@ $row++; } // Logo - $table_report->data['custom_report_front-logo'][0] = __('Custom report front').' - '.__('Custom logo').ui_print_help_tip( - __("The dir of custom logos is in your www Console in 'images/custom_logo'. You can upload more files (ONLY JPEG AND PNG) in upload tool in console."), - true - ); + $table_report->data['custom_report_front-logo'][0] = __('Custom report front').' - '.__('Custom logo'); $table_report->data['custom_report_front-logo'][1] = html_print_select( $customLogos, 'custom_report_front_logo', @@ -1154,7 +1123,7 @@ $row++; ); echo '
    '; - echo ''.__('Reports configuration').''; + echo ''.__('Reports configuration ').ui_print_help_icon('reports_configuration_tab', true).''; html_print_table($table_report); echo '
    '; @@ -1171,7 +1140,7 @@ $row++; $table_other->size[3] = '12%'; $table_other->data = []; - $table_other->data[$row][0] = __('Custom graphviz directory').ui_print_help_tip(__('Custom directory where the graphviz binaries are stored.'), true); + $table_other->data[$row][0] = __('Custom graphviz directory'); $table_other->data[$row][1] = html_print_input_text( 'graphviz_bin_dir', $config['graphviz_bin_dir'], @@ -1195,10 +1164,6 @@ $row++; $row++; $table_other->data[$row][0] = __('Show only the group name'); - $table_other->data[$row][0] .= ui_print_help_tip( - __('Show the group name instead the group icon.'), - true - ); $table_other->data[$row][1] = html_print_checkbox_switch( 'show_group_name', 1, diff --git a/pandora_console/godmode/setup/setup_websocket_engine.php b/pandora_console/godmode/setup/setup_websocket_engine.php index fecc60a33c..c2e1530520 100644 --- a/pandora_console/godmode/setup/setup_websocket_engine.php +++ b/pandora_console/godmode/setup/setup_websocket_engine.php @@ -64,10 +64,7 @@ $t->data[1][2] = html_print_input_text( true ); -$t->data[2][0] = __('WebSocket proxy url').ui_print_help_tip( - __('If you had configured a wsproxy set here target URL (for instance ws://your.public.fqdn/ws).'), - true -); +$t->data[2][0] = __('WebSocket proxy url'); $t->data[2][2] = html_print_input_text( 'ws_proxy_url', $config['ws_proxy_url'], diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php index 7d0fc75876..8400a9ebe0 100755 --- a/pandora_console/godmode/snmpconsole/snmp_alert.php +++ b/pandora_console/godmode/snmpconsole/snmp_alert.php @@ -92,7 +92,7 @@ if ($update_alert || $modify_alert) { __('SNMP Console').' » '.__('Alert overview'), 'images/op_snmp.png', false, - 'snmp_alert_overview_tab', + '', false ); } diff --git a/pandora_console/godmode/tag/tag.php b/pandora_console/godmode/tag/tag.php index cb5fb27ab1..26fb885a42 100644 --- a/pandora_console/godmode/tag/tag.php +++ b/pandora_console/godmode/tag/tag.php @@ -125,7 +125,7 @@ if (is_metaconsole()) { __('Tags configuration'), 'images/tag.png', false, - 'tags_config', + '', true, $buttons ); diff --git a/pandora_console/godmode/update_manager/update_manager.php b/pandora_console/godmode/update_manager/update_manager.php index 6b5d6f3cdd..77da154565 100644 --- a/pandora_console/godmode/update_manager/update_manager.php +++ b/pandora_console/godmode/update_manager/update_manager.php @@ -55,12 +55,10 @@ switch ($tab) { case 'offline': $title = __('Update manager » Offline'); - $help_header = 'update_manager_offline_tab'; break; case 'online': $title = __('Update manager » Online'); - $help_header = 'update_manager_online_tab'; break; } @@ -68,7 +66,7 @@ ui_print_page_header( $title, 'images/gm_setup.png', false, - $help_header, + '', true, $buttons ); diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index ca30edf105..531c7cc025 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -151,7 +151,7 @@ if ($meta) { __('User detail editor').$header_title, 'images/gm_users.png', false, - 'profile_tab', + '', true, $buttons ); @@ -665,7 +665,7 @@ if (defined('METACONSOLE')) { } if (!$new_user) { - $user_id = '

    '.__('User ID').':

    '; + $user_id = '

    '.__('User ID').'

    '; $user_id .= ''.$id.''; $user_id .= html_print_input_hidden('id_user', $id, true); $user_id .= '
    '; @@ -709,7 +709,7 @@ $full_name = '
    '.html_print_input_text_extended true ).'
    '; -$language = '

    '.__('Language').':

    '; +$language = '

    '.__('Language').'

    '; $language .= html_print_select_from_sql( 'SELECT id_language, name FROM tlanguage', 'language', @@ -721,7 +721,7 @@ $language .= html_print_select_from_sql( ).'
    '; -$timezone = '

    '.__('Timezone').':

    '; +$timezone = '

    '.__('Timezone').ui_print_help_tip(__('The timezone must be that of the associated server.'), true).'

    '; $timezone .= html_print_timezone_select('timezone', $user_info['timezone']).'
    '; if ($config['user_can_update_password']) { @@ -760,7 +760,7 @@ if ($config['user_can_update_password']) { } $own_info = get_user_info($config['id_user']); -$global_profile = '
    '.__('Global Profile').': '; +$global_profile = '
    '.__('Global Profile').''; $global_profile .= '
    '; $global_profile .= html_print_radio_button_extended( 'is_admin', @@ -822,7 +822,7 @@ $phone = '
    '.html_print_input_text_extended( true ).'
    '; -$comments = '

    '.__('Comments').':

    '; +$comments = '

    '.__('Comments').'

    '; $comments .= html_print_textarea( 'comments', 2, @@ -852,7 +852,7 @@ if (!$meta) { // User only can change skins if has more than one group if (count($usr_groups) > 1) { if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) { - $skin = '

    '.__('Skin').':

    '; + $skin = '

    '.__('Skin').'

    '; $skin .= skins_print_select($id_usr, 'skin', $user_info['id_skin'], '', __('None'), 0, true).'
    '; } } @@ -1051,7 +1051,7 @@ echo '
    -

    Extra info:

    '.$email.$phone.$not_login.$session_time.'
    +

    Extra info

    '.$email.$phone.$not_login.$session_time.'
    '.$language.$access_or_pagination.$skin.$home_screen.$default_event_filter.$newsletter.'
    diff --git a/pandora_console/godmode/users/profile_list.php b/pandora_console/godmode/users/profile_list.php index a87323f0f8..c3dc4096f6 100644 --- a/pandora_console/godmode/users/profile_list.php +++ b/pandora_console/godmode/users/profile_list.php @@ -275,29 +275,29 @@ $table->align = []; $table->head['profiles'] = __('Profiles'); -$table->head['IR'] = 'IR'.ui_print_help_tip(__('System incidents reading'), true); -$table->head['IW'] = 'IW'.ui_print_help_tip(__('System incidents writing'), true); -$table->head['IM'] = 'IM'.ui_print_help_tip(__('System incidents management'), true); -$table->head['AR'] = 'AR'.ui_print_help_tip(__('Agents reading'), true); -$table->head['AW'] = 'AW'.ui_print_help_tip(__('Agents management'), true); -$table->head['AD'] = 'AD'.ui_print_help_tip(__('Agents disable'), true); -$table->head['LW'] = 'LW'.ui_print_help_tip(__('Alerts editing'), true); -$table->head['LM'] = 'LM'.ui_print_help_tip(__('Alerts management'), true); -$table->head['UM'] = 'UM'.ui_print_help_tip(__('Users management'), true); -$table->head['DM'] = 'DM'.ui_print_help_tip(__('Database management'), true); -$table->head['ER'] = 'ER'.ui_print_help_tip(__('Events reading'), true); -$table->head['EW'] = 'EW'.ui_print_help_tip(__('Events writing'), true); -$table->head['EM'] = 'EM'.ui_print_help_tip(__('Events management'), true); -$table->head['RR'] = 'RR'.ui_print_help_tip(__('Reports reading'), true); -$table->head['RW'] = 'RW'.ui_print_help_tip(__('Reports writing'), true); -$table->head['RM'] = 'RM'.ui_print_help_tip(__('Reports management'), true); -$table->head['MR'] = 'MR'.ui_print_help_tip(__('Network maps reading'), true); -$table->head['MW'] = 'MW'.ui_print_help_tip(__('Network maps writing'), true); -$table->head['MM'] = 'MM'.ui_print_help_tip(__('Network maps management'), true); -$table->head['VR'] = 'VR'.ui_print_help_tip(__('Visual console reading'), true); -$table->head['VW'] = 'VW'.ui_print_help_tip(__('Visual console writing'), true); -$table->head['VM'] = 'VM'.ui_print_help_tip(__('Visual console management'), true); -$table->head['PM'] = 'PM'.ui_print_help_tip(__('Systems management'), true); +$table->head['IR'] = 'IR'; +$table->head['IW'] = 'IW'; +$table->head['IM'] = 'IM'; +$table->head['AR'] = 'AR'; +$table->head['AW'] = 'AW'; +$table->head['AD'] = 'AD'; +$table->head['LW'] = 'LW'; +$table->head['LM'] = 'LM'; +$table->head['UM'] = 'UM'; +$table->head['DM'] = 'DM'; +$table->head['ER'] = 'ER'; +$table->head['EW'] = 'EW'; +$table->head['EM'] = 'EM'; +$table->head['RR'] = 'RR'; +$table->head['RW'] = 'RW'; +$table->head['RM'] = 'RM'; +$table->head['MR'] = 'MR'; +$table->head['MW'] = 'MW'; +$table->head['MM'] = 'MM'; +$table->head['VR'] = 'VR'; +$table->head['VW'] = 'VW'; +$table->head['VM'] = 'VM'; +$table->head['PM'] = 'PM'; $table->head['operations'] = ''.__('Op.').''; $table->align = array_fill(1, 11, 'center'); diff --git a/pandora_console/include/class/Diagnostics.class.php b/pandora_console/include/class/Diagnostics.class.php index 179cf6ffd1..bcf36551d7 100644 --- a/pandora_console/include/class/Diagnostics.class.php +++ b/pandora_console/include/class/Diagnostics.class.php @@ -152,7 +152,7 @@ class Diagnostics extends Wizard __('%s Diagnostic tool', $this->product_name), 'images/gm_massive_operations.png', false, - 'diagnostic_tool_tab', + '', true, $header_buttons ); diff --git a/pandora_console/include/class/ManageNetScanScripts.class.php b/pandora_console/include/class/ManageNetScanScripts.class.php index c4a61bae37..cc63820049 100644 --- a/pandora_console/include/class/ManageNetScanScripts.class.php +++ b/pandora_console/include/class/ManageNetScanScripts.class.php @@ -117,8 +117,20 @@ class ManageNetScanScripts extends Wizard // Avoid to print header out of wizard. $this->prepareBreadcrum($breadcrum); - // Header - ui_print_page_header(__('Net scan scripts'), '', false, '', true, '', false, '', GENERIC_SIZE_TEXT, '', $this->printHeader(true)); + // Header. + ui_print_page_header( + __('Net scan scripts'), + '', + false, + '', + true, + '', + false, + '', + GENERIC_SIZE_TEXT, + '', + $this->printHeader(true) + ); } $id_script = get_parameter('id_script', 0); @@ -535,12 +547,6 @@ class ManageNetScanScripts extends Wizard $data = []; $data[0] = __('Name'); - $data[0] .= ui_print_help_icon( - 'reconscript_definition', - true, - '', - 'images/help_w.png' - ); $data[1] = ''; $table->data['recon_name'] = $data; diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index eaea211d2a..724fe11fd6 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -4146,35 +4146,11 @@ function get_help_info($section_name) } switch ($section_name) { - case 'tactical_view': - if ($es) { - $result .= 'Presentacion_datos/visualizacion&printable=yes#Vista_t.C3.A1ctica'; - } else { - $result .= 'Data_Presentation/Visualization&printable=yes#Tactical_view'; - } - break; - - case 'group_view': - if ($es) { - $result .= 'Presentacion_datos/visualizacion&printable=yes#Vista_de_Grupos'; - } else { - $result .= 'Data_Presentation/Visualization&printable=yes#Group_view'; - } - break; - case 'tree_view': if ($es) { $result .= 'Presentacion_datos/visualizacion&printable=yes#Vista_de_.C3.A1rbol'; } else { - $result .= 'Data_Presentation/Visualization&printable=yes#The_Tree_View'; - } - break; - - case 'monitor_detail_view': - if ($es) { - $result .= 'Presentacion_datos/visualizacion&printable=yes#Detalles_Monitores'; - } else { - $result .= 'Data_Presentation/Visualization&printable=yes#Monitor_Details'; + $result .= 'Data_Presentation/Visualization#Tree_View'; } break; @@ -4242,14 +4218,6 @@ function get_help_info($section_name) } break; - case 'agent_status': - if ($es) { - $result .= 'Presentacion_datos/visualizacion&printable=yes#Detalles_del_agente'; - } else { - $result .= 'Data_Presentation/Visualization&printable=yes#Agent_Details'; - } - break; - case 'agent_main_tab': if ($es) { $result .= 'Intro_Monitorizacion&printable=yes#Visualizaci.C3.B3n_del_agente'; @@ -4314,14 +4282,6 @@ function get_help_info($section_name) } break; - case 'configure_gis_map': - if ($es) { - $result .= 'Pandora_GIS&printable=yes#Introducci.C3.B3n'; - } else { - $result .= 'GIS&printable=yes#Introduction'; - } - break; - case 'configure_gis_map_edit': if ($es) { $result .= 'Pandora_GIS&printable=yes#GIS_Maps'; @@ -4492,6 +4452,13 @@ function get_help_info($section_name) break; case 'ipam_network_tab': + if ($es) { + $result .= 'IPAM#Vista_de_edici.C3.B3n'; + } else { + $result .= 'IPAM#Edit_view'; + } + break; + case 'ipam_force_tab': if ($es) { $result .= 'IPAM&printable=yes#Vista_de_iconos'; @@ -4520,7 +4487,7 @@ function get_help_info($section_name) if ($es) { $result .= 'Intro_Monitorizacion&printable=yes#Configuraci.C3.B3n_del_agente_en_consola'; } else { - $result .= 'Intro_Monitoring&printable=yes#Agent_configuration_in_the_console'; + $result .= 'Intro_Monitoring#Agent_setup_in_the_console'; } break; @@ -4540,46 +4507,6 @@ function get_help_info($section_name) } break; - case 'map_builder_intro': - if ($es) { - $result .= 'Presentacion_datos/Mapas_visuales&printable=yes#Introducci.C3.B3n'; - } else { - $result .= 'Data_Presentation/Visual_Maps&printable=yes#Introduction'; - } - break; - - case 'map_builder_favorite': - if ($es) { - $result .= 'Presentacion_datos/Mapas_visuales&printable=yes#Consolas_visuales_favoritas'; - } else { - $result .= 'Data_Presentation/Visual_Maps&printable=yes#Favorite_visual_consoles'; - } - break; - - case 'map_builder_template': - if ($es) { - $result .= 'Presentacion_datos/Mapas_visuales&printable=yes#Plantillas_de_consolas_visuales'; - } else { - $result .= 'Data_Presentation/Visual_Maps&printable=yes#Visual_Console_Templates'; - } - break; - - case 'map_builder_wizard': - if ($es) { - $result .= 'Presentacion_datos/Mapas_visuales&printable=yes#Asistente_de_consola_visuales'; - } else { - $result .= 'Data_Presentation/Visual_Maps&printable=yes#Wizard_Visual_Console'; - } - break; - - case 'module_linking': - if ($es) { - $result .= 'Politicas&printable=yes#Tipos_de_m.C3.B3dulos'; - } else { - $result .= 'Policy&printable=yes#Types_of_Modules'; - } - break; - case 'network_map_enterprise_edit': if ($es) { $result .= 'Presentacion_datos/Mapas_de_red&printable=yes#Mapa_de_red_no_vac.C3.ADo'; @@ -4660,22 +4587,6 @@ function get_help_info($section_name) } break; - case 'plugin_policy': - if ($es) { - $result .= 'Politicas&printable=yes#Plugins_de_agente'; - } else { - $result .= 'Policy&printable=yes#Agent_Plug_Ins'; - } - break; - - case 'policy_queue': - if ($es) { - $result .= 'Politicas&printable=yes#Gesti.C3.B3n_de_la_cola_de_pol.C3.ADticas'; - } else { - $result .= 'Policy&printable=yes#Policy_Queues_Management'; - } - break; - case 'prediction_source_module': if ($es) { $result .= 'Monitorizacion_otra&printable=yes#Tipos_de_monitorizaci.C3.B3n_predictiva'; @@ -4724,51 +4635,11 @@ function get_help_info($section_name) } break; - case 'reporting_advanced_tab': - if ($es) { - $result .= 'Presentacion_datos/Informes&printable=yes#Opciones_avanzadas_de_informe'; - } else { - $result .= 'Data_Presentation/Reports&printable=yes#The_Advanced_Options_Tab'; - } - break; - - case 'reporting_global_tab': - if ($es) { - $result .= 'Presentacion_datos/Informes&printable=yes#Global'; - } else { - $result .= 'Data_Presentation/Reports&printable=yes#The_Global_Tab'; - } - break; - case 'reporting_item_editor_tab': if ($es) { $result .= 'Presentacion_datos/Informes&printable=yes#Pesta.C3.B1a_Item_editor'; } else { - $result .= 'Data_Presentation/Reports&printable=yes#The_.27Item_Editor.27_Tab'; - } - break; - - case 'reporting_list_items_tab': - if ($es) { - $result .= 'Presentacion_datos/Informes&printable=yes#Pesta.C3.B1a_List_Items'; - } else { - $result .= 'Data_Presentation/Reports&printable=yes#The_.27List_Items.27_Tab'; - } - break; - - case 'reporting_wizard_sla_tab': - if ($es) { - $result .= 'Presentacion_datos/Informes&printable=yes#Wizard_SLA'; - } else { - $result .= 'Data_Presentation/Reports&printable=yes#The_SLA_Wizard_Tab'; - } - break; - - case 'reporting_wizard_tab': - if ($es) { - $result .= 'Presentacion_datos/Informes&printable=yes#Wizard_general'; - } else { - $result .= 'Data_Presentation/Reports&printable=yes#The_Wizard_Tab'; + $result .= 'Data_Presentation/Reports#Types_of_Items'; } break; @@ -4780,14 +4651,6 @@ function get_help_info($section_name) } break; - case 'events_responses_tab': - if ($es) { - $result .= 'Eventos&printable=yes#Introducci.C3.B3n_3'; - } else { - $result .= 'Events&printable=yes#Introduction_3'; - } - break; - case 'servers': if ($es) { $result .= 'Interfaz&printable=yes#Gesti.C3.B3n_de_servidores'; @@ -4804,19 +4667,11 @@ function get_help_info($section_name) } break; - case 'tags_config': - if ($es) { - $result .= 'Gestion_y_Administracion&printable=yes#Sistemas_de_permisos_ampliados_mediante_etiquetas_.28tags.29'; - } else { - $result .= 'Managing_and_Administration&printable=yes#Permission_system_extended_by_tags'; - } - break; - case 'transactional_map_phases': if ($es) { $result .= 'Monitorizacion_transaccional&printable=yes#Creaci.C3.B3n_del_.C3.A1rbol_de_fases'; } else { - $result .= 'Transactional_Monitoring&printable=yes#Creating_the_phase_tree'; + $result .= 'Transactional_Monitoring#Creating_the_stage_tree'; } break; @@ -4840,7 +4695,7 @@ function get_help_info($section_name) if ($es) { $result .= 'Gestion_y_Administracion&printable=yes#Configuraci.C3.B3n_de_notificaciones'; } else { - $result .= 'Managing_and_Administration&printable=yes#Notification_configuration'; + $result .= 'Managing_and_Administration#Notification_setup'; } break; @@ -4864,7 +4719,7 @@ function get_help_info($section_name) if ($es) { $result .= 'Presentacion_datos/Mapas_visuales&printable=yes#Creaci.C3.B3n_y_edici.C3.B3n_de_consolas_visuales'; } else { - $result .= 'Data_Presentation/Visual_Maps&printable=yes#Creation_and_edition_of_Visual_Consoles'; + $result .= 'Data_Presentation/Visual_Maps#Elements_a_map_can_contain'; } break; @@ -4900,22 +4755,6 @@ function get_help_info($section_name) } break; - case 'view_created_map_services_tab': - if ($es) { - $result .= 'Servicios&printable=yes#Vista_de_mapa_de_servicio'; - } else { - $result .= 'Services&printable=yes#Service_Map_View'; - } - break; - - case 'view_created_services_tab': - if ($es) { - $result .= 'Servicios&printable=yes#Lista_simple_de_un_servicio_y_todos_los_elementos_que_contiene'; - } else { - $result .= 'Services&printable=yes#List-based_view_of_a_Service_and_its_Elements'; - } - break; - case 'config_service_element_tab': if ($es) { $result .= 'Servicios&printable=yes#Configuraci.C3.B3n_de_elementos'; @@ -4944,7 +4783,7 @@ function get_help_info($section_name) if ($es) { $result .= 'Configuracion_Consola&printable=yes#Configuraci.C3.B3n_servicios'; } else { - $result .= 'Console_Setup&printable=yes#Services_configuration'; + $result .= 'Console_Setup#Service_setup'; } break; @@ -4952,7 +4791,7 @@ function get_help_info($section_name) if ($es) { $result .= 'Configuracion_Consola&printable=yes#Configuraci.C3.B3n_de_las_consolas_visuales'; } else { - $result .= 'Console_Setup&printable=yes#Visual_console_configuration'; + $result .= 'Console_Setup#Visual_console_setup'; } break; @@ -4992,7 +4831,7 @@ function get_help_info($section_name) if ($es) { $result .= 'Configuracion_Consola&printable=yes#Configuraci.C3.B3n_del_comportamiento'; } else { - $result .= 'Console_Setup&printable=yes#Behaviour_configuration'; + $result .= 'Console_Setup#Performance_configuration'; } break; @@ -5012,14 +4851,6 @@ function get_help_info($section_name) } break; - case 'diagnostic_tool_tab': - if ($es) { - $result .= 'Gestion_y_Administracion&printable=yes#Diagnostic_tool'; - } else { - $result .= 'Managing_and_Administration&printable=yes#Diagnostic_tool'; - } - break; - case 'performance_metrics_tab': if ($es) { $result .= 'Optimizacion&printable=yes#Comprobaci.C3.B3n_del_fichero_my.ini.2Fcnf'; @@ -5108,14 +4939,6 @@ function get_help_info($section_name) } break; - case 'export_target_tab': - if ($es) { - $result .= 'ExportServer&printable=yes#A.C3.B1adir_un_servidor_de_destino'; - } else { - $result .= 'Export_Server&printable=yes#Adding_a_Target_Server'; - } - break; - case 'servers_ha_clusters_tab': if ($es) { $result .= 'HA&printable=yes#Alta_disponibilidad_del_Servidor_de_Datos'; @@ -5152,7 +4975,7 @@ function get_help_info($section_name) if ($es) { $result .= 'Monitorizacion_remota&printable=yes#Wizard_SNMP'; } else { - $result .= 'Remote_Monitoring&printable=yes#SNMP_Wizard'; + $result .= 'Remote_Monitoring#SNMP_Wizard'; } break; @@ -5160,7 +4983,7 @@ function get_help_info($section_name) if ($es) { $result .= 'Monitorizacion_remota&printable=yes#SNMP_Interfaces_wizard'; } else { - $result .= 'Remote_Monitoring&printable=yes#SNMP_Interface_Wizard'; + $result .= 'Remote_Monitoring#SNMP_Interface_Wizard'; } break; @@ -5172,14 +4995,6 @@ function get_help_info($section_name) } break; - case 'group_list_tab': - if ($es) { - $result .= 'Gestion_y_Administracion&printable=yes#Introducci.C3.B3n_2'; - } else { - $result .= 'Managing_and_Administration&printable=yes#Introduction_2'; - } - break; - case 'acl_setup_tab': if ($es) { $result .= 'Gestion_y_Administracion&printable=yes#Introducci.C3.B3n_3'; @@ -5206,9 +5021,9 @@ function get_help_info($section_name) case 'network_component_tab': if ($es) { - $result .= 'Plantillas_y_Componentes&printable=yes#Componentes_de_red'; + $result .= 'Intro_Monitorizacion#Par.C3.A1metros_comunes'; } else { - $result .= 'Templates_and_components&printable=yes#Network_Components'; + $result .= 'Intro_Monitoring#Common_Parameters'; } break; @@ -5220,19 +5035,11 @@ function get_help_info($section_name) } break; - case 'module_template_tab': - if ($es) { - $result .= 'Plantillas_y_Componentes&printable=yes#Plantillas_de_m.C3.B3dulos'; - } else { - $result .= 'Templates_and_components&printable=yes#Module_Templates'; - } - break; - case 'agent_autoconf_tab': if ($es) { - $result .= 'Configuracion_Agentes&printable=yes#Introducci.C3.B3n'; + $result .= 'Configuracion_Agentes#Creaci.C3.B3n.2Fedici.C3.B3n_de_autoconfiguraci.C3.B3n'; } else { - $result .= 'Configuration_Agents&printable=yes#Introduction'; + $result .= 'Configuration_Agents#Creation_of_an_automatic_agent_configuration'; } break; @@ -5246,17 +5053,17 @@ function get_help_info($section_name) case 'massive_agents_tab': if ($es) { - $result .= 'Operaciones_Masivas&printable=yes#Edici.C3.B3n_masiva_de_agentes'; + $result .= 'Intro_Monitorizacion#Configuraci.C3.B3n_del_agente_en_consola'; } else { - $result .= 'Massive_Operations&printable=yes#Agent_massive_edition'; + $result .= 'Intro_Monitoring#Agent_setup_in_the_console'; } break; case 'massive_modules_tab': if ($es) { - $result .= 'Operaciones_Masivas&printable=yes#Edici.C3.B3n_masiva_de_m.C3.B3dulos'; + $result .= 'Intro_Monitorizacion#Par.C3.A1metros_comunes'; } else { - $result .= 'Massive_Operations&printable=yes#Modules_massive_edition'; + $result .= 'Intro_Monitoring#Common_Parameters'; } break; @@ -5308,22 +5115,6 @@ function get_help_info($section_name) } break; - case 'alerts_command_tab': - if ($es) { - $result .= 'Alertas&printable=yes#Introducci.C3.B3n_2'; - } else { - $result .= 'Alerts&printable=yes#Introduction_2'; - } - break; - - case 'alerts_config_command_tab': - if ($es) { - $result .= 'Alertas&printable=yes#Creaci.C3.B3n_de_un_comando_para_una_alerta'; - } else { - $result .= 'Alerts&printable=yes#Command_Creation_for_an_Alert'; - } - break; - case 'configure_alert_event_step_1': if ($es) { $result .= 'Eventos&printable=yes#Creaci.C3.B3n_alerta_de_evento'; @@ -5344,7 +5135,7 @@ function get_help_info($section_name) if ($es) { $result .= 'Monitorizacion_traps_SNMP&printable=yes#Introducci.C3.B3n_2'; } else { - $result .= 'SNMP_traps_Monitoring&printable=yes#Introduction_2'; + $result .= 'SNMP_traps_Monitoring#Adding_an_alert'; } break; @@ -5352,7 +5143,7 @@ function get_help_info($section_name) if ($es) { $result .= 'Monitorizacion_traps_SNMP&printable=yes#A.C3.B1adir_una_alerta'; } else { - $result .= 'SNMP_traps_Monitoring&printable=yes#Alert_Creation'; + $result .= 'SNMP_traps_Monitoring#Adding_an_alert'; } break; @@ -5517,7 +5308,7 @@ function get_help_info($section_name) case 'alert_rules': if ($es) { - $result .= 'Alerts#Rules_within_a_correlation_alert'; + $result .= 'Alertas#Reglas_dentro_de_una_alerta_de_correlaci.C3.B3n'; } else { $result .= 'Alerts#Rules_within_a_correlation_alert'; } @@ -5538,6 +5329,162 @@ function get_help_info($section_name) $result .= 'Alerts#Configuring_an_alert_template'; } break; + + case 'log_viewer_advanced_options': + if ($es) { + $result .= 'Monitorizacion_logs#Visualizaci.C3.B3n_y_b.C3.BAsqueda_avanzadas'; + } else { + $result .= 'Log_Monitoring#Display_and_advanced_search'; + } + break; + + case 'snmp_console': + if ($es) { + $result .= 'Monitorizacion_traps_SNMP#Acceso_a_la_consola_de_recepci.C3.B3n_de_traps'; + } else { + $result .= 'SNMP_traps_Monitoring#Access_to_TRAP_Reception_Console'; + } + break; + + case 'cluster_view': + if ($es) { + $result .= 'Clusters#Planificando_la_monitorizaci.C3.B3n'; + } else { + $result .= 'Clusters#Planning_monitoring'; + } + break; + + case 'aws_view': + if ($es) { + $result .= 'Discovery#Discovery_Cloud._Vista_general'; + } else { + $result .= 'Discovery#Discovery_Cloud._Overview'; + } + break; + + case 'sap_view': + if ($es) { + $result .= 'Discovery#SAP_View'; + } else { + $result .= 'Discovery#SAP_View'; + } + break; + + case 'vmware_view': + if ($es) { + $result .= 'Monitorizacion_entornos_Virtuales#Gesti.C3.B3n_y_visualizaci.C3.B3n_de_la_arquitectura_virtual_VMware'; + } else { + $result .= 'Virtual_environment_monitoring#VMware_Virtual_Architecture_management_and_display'; + } + break; + + case 'visual_console_view': + if ($es) { + $result .= 'Presentacion_datos/Mapas_visuales#Elementos_que_puede_contener_un_mapa'; + } else { + $result .= 'Data_Presentation/Visual_Maps#Elements_a_map_can_contain'; + } + break; + + case 'create_container': + if ($es) { + $result .= 'Presentacion_datos/visualizacion#Contenedores_de_gr.C3.A1ficas'; + } else { + $result .= 'Data_Presentation/Visualization#Graph_containers'; + } + break; + + case 'setup_integria_tab': + if ($es) { + $result .= 'Gestion_de_Indicencias#Gesti.C3.B3n_de_incidencias_en_Pandora_FMS_con_Integria_IMS'; + } else { + $result .= 'Incidence_Management'; + } + break; + + case 'deployment_center_tab': + if ($es) { + $result .= 'Discovery#Despliegue_autom.C3.A1tico_de_agentes'; + } else { + $result .= 'Discovery#Automatic_agent_deployment'; + } + break; + + case 'Aws_credentials_tab': + if ($es) { + $result .= 'Discovery#Discovery_Cloud:_Amazon_Web_Services_.28AWS.29'; + } else { + $result .= 'Discovery#Discovery_Cloud:_AWS'; + } + break; + + case 'Azure_credentials_tab': + if ($es) { + $result .= 'Discovery#Discovery_Cloud:_Microsoft_Azure'; + } else { + $result .= 'Discovery#Discovery_Cloud:_Microsoft_Azure'; + } + break; + + case 'add_policy_tab': + if ($es) { + $result .= 'Intro_Monitorizacion#Par.C3.A1metros_comunes'; + } else { + $result .= 'Intro_Monitoring#Common_Parameters'; + } + break; + + case 'password_tab': + if ($es) { + $result .= 'Configuracion_Consola#Password'; + } else { + $result .= 'Console_Setup#Password_Policy'; + } + break; + + case 'setup_netflow_tab': + if ($es) { + $result .= 'Configuracion_Consola#Netflow'; + } else { + $result .= 'Console_Setup#Netflow'; + } + break; + + case 'map_connection_tab': + if ($es) { + $result .= 'Pandora_GIS#Configuraci.C3.B3n_B.C3.A1sica'; + } else { + $result .= 'GIS#Basic_Configuration'; + } + break; + + case 'command_definition': + if ($es) { + $result .= 'Omnishell#Ejemplo_de_uso'; + } else { + $result .= 'Omnishell#Usage_example'; + } + break; + + case 'network_tools_tab': + if ($es) { + $result .= 'Gestion_y_Administracion#Network_Tools'; + } else { + $result .= 'Managing_and_Administration#Network_Tools'; + } + break; + + case 'reports_configuration_tab': + if ($es) { + $result .= 'Configuracion_Consola#Configuraci.C3.B3n_informes'; + } else { + $result .= 'Console_Setup#Reports_configuration'; + } + break; + + default: + // Default. + break; } return $result; diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php index 175753b75c..51d7499c31 100755 --- a/pandora_console/operation/agentes/alerts_status.php +++ b/pandora_console/operation/agentes/alerts_status.php @@ -174,7 +174,12 @@ if ($idAgent != 0) { $print_agent = true; if (!is_metaconsole()) { - ui_print_page_header(__('Alert detail'), 'images/op_alerts.png', false, 'alert_validation'); + ui_print_page_header( + __('Alert detail'), + 'images/op_alerts.png', + false, + '' + ); } else { ui_meta_print_header(__('Alerts view')); } diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php index ba51431416..b1e53b88d2 100644 --- a/pandora_console/operation/agentes/estado_agente.php +++ b/pandora_console/operation/agentes/estado_agente.php @@ -185,7 +185,14 @@ if (check_acl($config['id_user'], 0, 'AW')) { $onheader = ['setup' => $setuptab]; } -ui_print_page_header(__('Agent detail'), 'images/agent_mc.png', false, 'agent_status', false, $onheader); +ui_print_page_header( + __('Agent detail'), + 'images/agent_mc.png', + false, + '', + false, + $onheader +); if (!$strict_user) { if (tags_has_user_acl_tags()) { diff --git a/pandora_console/operation/agentes/group_view.php b/pandora_console/operation/agentes/group_view.php index c8d6b562a8..8bb06e7100 100644 --- a/pandora_console/operation/agentes/group_view.php +++ b/pandora_console/operation/agentes/group_view.php @@ -70,7 +70,7 @@ ui_print_page_header( __('Group view'), 'images/group.png', false, - 'group_view', + '', false, $updated_time ); diff --git a/pandora_console/operation/agentes/pandora_networkmap.php b/pandora_console/operation/agentes/pandora_networkmap.php index 97ebcf82c3..70e021684c 100644 --- a/pandora_console/operation/agentes/pandora_networkmap.php +++ b/pandora_console/operation/agentes/pandora_networkmap.php @@ -649,7 +649,7 @@ switch ($tab) { __('Networkmap'), 'images/op_network.png', false, - 'network_map_enterprise_list', + '', false ); diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index 9337cf9a53..16c6223041 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -62,7 +62,14 @@ if (! defined('METACONSOLE')) { break; } - ui_print_page_header(__('Monitor detail').$subpage, '', false, 'monitor_detail_view', true, $buttons); + ui_print_page_header( + __('Monitor detail').$subpage, + '', + false, + '', + true, + $buttons + ); if ($section == 'fields') { include_once $config['homedir'].'/godmode/agentes/status_monitor_custom_fields.php'; diff --git a/pandora_console/operation/agentes/tactical.php b/pandora_console/operation/agentes/tactical.php index b691d313d9..19c5505e9d 100755 --- a/pandora_console/operation/agentes/tactical.php +++ b/pandora_console/operation/agentes/tactical.php @@ -54,7 +54,7 @@ ui_print_page_header( __('Tactical view'), '', false, - 'tactical_view', + '', false, $updated_time ); diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index 8f093fcff8..acb31f5cdc 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -1537,7 +1537,7 @@ if (!$config['pure']) { agents_get_alias($id_agente), $icon, false, - $help_header, + '', false, $onheader, false, diff --git a/pandora_console/operation/gis_maps/gis_map.php b/pandora_console/operation/gis_maps/gis_map.php index b89952fe78..59b3b6da64 100644 --- a/pandora_console/operation/gis_maps/gis_map.php +++ b/pandora_console/operation/gis_maps/gis_map.php @@ -35,7 +35,7 @@ ui_print_page_header( __('GIS Maps'), 'images/op_gis.png', false, - 'configure_gis_map', + '', false, $buttons ); diff --git a/pandora_console/operation/incidents/list_integriaims_incidents.php b/pandora_console/operation/incidents/list_integriaims_incidents.php index d97276c15e..5873830f52 100644 --- a/pandora_console/operation/incidents/list_integriaims_incidents.php +++ b/pandora_console/operation/incidents/list_integriaims_incidents.php @@ -27,7 +27,14 @@ if (! check_acl($config['id_user'], 0, 'IR')) { // Header tabs. $onheader = integriaims_tabs('list_tab'); -ui_print_page_header(__('Integria IMS Tickets'), '', false, '', false, $onheader); +ui_print_page_header( + __('Integria IMS Tickets'), + '', + false, + 'integria_tab', + false, + $onheader +); // Check if Integria integration enabled. if ($config['integria_enabled'] == 0) { diff --git a/pandora_console/operation/netflow/nf_live_view.php b/pandora_console/operation/netflow/nf_live_view.php index 39cb2e3fcf..a171343030 100644 --- a/pandora_console/operation/netflow/nf_live_view.php +++ b/pandora_console/operation/netflow/nf_live_view.php @@ -289,7 +289,7 @@ if (is_metaconsole()) { 'images/calendar_view_day.png', true, ['alt' => 'calendar'] - ).ui_print_help_tip(__('Date format is YY/MM/DD'), true).html_print_input_text('time', $time, false, 10, 8, true).ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true); + ).html_print_input_text('time', $time, false, 10, 8, true); echo ''; echo ''.__('Resolution').ui_print_help_tip(__('The interval will be divided in chunks the length of the resolution.'), true).''; @@ -333,7 +333,7 @@ if (is_metaconsole()) { echo ''.html_print_select($max_values, 'max_aggregates', $max_aggregates, '', '', 0, true).''.html_print_image('images/pencil.png', true, ['id' => 'pencil']).''; echo ''; - echo ''.__('Aggregate by').''.ui_print_help_icon('aggregate_by', true).''; + echo ''.__('Aggregate by').''; $aggregate_list = []; $aggregate_list = [ 'srcip' => __('Src Ip Address'), diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php index bd59c91814..e7fd2143c2 100755 --- a/pandora_console/operation/snmpconsole/snmp_view.php +++ b/pandora_console/operation/snmpconsole/snmp_view.php @@ -659,7 +659,7 @@ if (empty($traps)) { __('SNMP Console'), 'images/op_snmp.png', false, - '', + 'snmp_console', false, [ $list, diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php index d02b117720..68481936bf 100644 --- a/pandora_console/operation/users/user_edit.php +++ b/pandora_console/operation/users/user_edit.php @@ -387,7 +387,7 @@ if (!$meta) { $skin = ''; } -$timezone = '

    '.__('Timezone').':

    '; +$timezone = '

    '.__('Timezone').ui_print_help_tip(__('The timezone must be that of the associated server.'), true).'

    '; $timezone .= html_print_timezone_select('timezone', $user_info['timezone']).'
    '; // Double auth. diff --git a/pandora_console/operation/visual_console/legacy_view.php b/pandora_console/operation/visual_console/legacy_view.php index d81f9b0f6e..19e18503ac 100644 --- a/pandora_console/operation/visual_console/legacy_view.php +++ b/pandora_console/operation/visual_console/legacy_view.php @@ -170,7 +170,14 @@ $options['view']['active'] = true; if (!is_metaconsole()) { if (!$config['pure']) { $options['pure']['text'] = '    '.html_print_image('images/full_screen.png', true, ['title' => __('Full screen mode')]).''; - ui_print_page_header($layout_name, 'images/visual_console.png', false, '', false, $options); + ui_print_page_header( + $layout_name, + 'images/visual_console.png', + false, + 'visual_console_view', + false, + $options + ); } // Set the hidden value for the javascript diff --git a/pandora_console/operation/visual_console/view.php b/pandora_console/operation/visual_console/view.php index a6e651f41f..668d0df658 100644 --- a/pandora_console/operation/visual_console/view.php +++ b/pandora_console/operation/visual_console/view.php @@ -187,7 +187,7 @@ if (!is_metaconsole()) { $visualConsoleName, 'images/visual_console.png', false, - '', + 'visual_console_view', false, $options ); diff --git a/pandora_console/views/dashboard/list.php b/pandora_console/views/dashboard/list.php index b75cea10ac..e5c37b2500 100644 --- a/pandora_console/views/dashboard/list.php +++ b/pandora_console/views/dashboard/list.php @@ -38,7 +38,7 @@ ui_require_css_file('dashboards'); __('Dashboards'), '', false, - 'dashboards_tab', + '', false ); From bb9f8788160c7da59adf8e023c90d813de3d009d Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Fri, 29 May 2020 11:47:37 +0200 Subject: [PATCH 055/116] Integer comparison when available --- .../include/javascript/multiselect_filtered.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/javascript/multiselect_filtered.js b/pandora_console/include/javascript/multiselect_filtered.js index 5e41ae1ecd..0366f870a4 100644 --- a/pandora_console/include/javascript/multiselect_filtered.js +++ b/pandora_console/include/javascript/multiselect_filtered.js @@ -120,8 +120,13 @@ function reloadContent(id, url, options, side, noneStr) { let items = Object.entries(data).sort(function(a, b) { if (a[1] == b[1]) return 0; - if (parseInt(a[1]) != 0 && parseInt(b[1]) != 0) - return parseInt(a[1]) > parseInt(b[1]) ? 1 : -1; + + var int_a = parseInt(a[1]); + var int_b = parseInt(b[1]); + + if (!isNaN(int_a) && !isNaN(int_b)) { + return int_a > int_b ? 1 : -1; + } return a[1] > b[1] ? 1 : -1; }); From a56ee5dac5a24c838f2f711690ac2d7e27b912b8 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Fri, 29 May 2020 13:07:53 +0200 Subject: [PATCH 056/116] Ent 5648 querier avanzado en la vista de log collector --- pandora_console/godmode/menu.php | 1 + pandora_console/include/styles/ace.css | 52 ++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 pandora_console/include/styles/ace.css diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index 7a5295f1c5..dce8b584da 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -385,6 +385,7 @@ if (check_acl($config['id_user'], 0, 'PM') || check_acl($config['id_user'], 0, ' $sub['extensions/dbmanager']['text'] = __('DB Interface'); $sub['extensions/dbmanager']['id'] = 'DB Interface'; $sub['extensions/dbmanager']['sec'] = 'gbman'; + enterprise_hook('elasticsearch_interface_menu'); } } diff --git a/pandora_console/include/styles/ace.css b/pandora_console/include/styles/ace.css new file mode 100644 index 0000000000..db0895a7a0 --- /dev/null +++ b/pandora_console/include/styles/ace.css @@ -0,0 +1,52 @@ +#elasticsearch_container { + display: flex; +} + +.elasticsearch_editor_container { + width: 30%; +} + +.elasticsearch_editor_container p { + padding-left: 40px; + font-size: medium; + margin-top: 5px; + margin-bottom: 5px; +} + +.elasticsearch_editor { + width: 100%; + height: 65em; + border-top: 1px solid #e2e2e2; + border-right: 1px solid #e2e2e2; + border-bottom: 1px solid #e2e2e2; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; +} + +.elasticsearch_view_container { + width: 70%; + margin-left: 30px; +} + +.elasticsearch_view_container p { + padding-left: 40px; + font-size: medium; + margin-top: 5px; + margin-bottom: 5px; +} + +.elasticsearch_view { + min-height: 65em; + border-top: 1px solid #e2e2e2; + border-left: 1px solid #e2e2e2; + border-bottom: 1px solid #e2e2e2; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; +} + +.edit-button { + margin-top: 10px; + margin-bottom: 10px; +} From 2de8f2b7309c31d6cceec960d000cb45cf025f3f Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Fri, 29 May 2020 13:40:43 +0200 Subject: [PATCH 057/116] minor fix --- pandora_console/operation/agentes/estado_agente.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php index c97bc71a33..342738fc7b 100644 --- a/pandora_console/operation/agentes/estado_agente.php +++ b/pandora_console/operation/agentes/estado_agente.php @@ -808,7 +808,7 @@ foreach ($agents as $agent) { $url = ui_get_full_url( $url.'&op=view&id='.$cluster->id() ); - echo ''.__('View').''; + $data[0] .= ''.__('View').''; } } else { $data[0] .= ''.__('View').''; @@ -827,7 +827,7 @@ foreach ($agents as $agent) { $url = ui_get_full_url( $url.'&op=update&id='.$cluster->id() ); - echo ''.__('Edit').''; + $data[0] .= ''.__('Edit').''; } } else { $data[0] .= ''.__('Edit').''; From 969d4a36c1c812354d82086b6e41c09d19daf182 Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 30 May 2020 01:00:19 +0200 Subject: [PATCH 058/116] 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.rhel7.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/lib/PandoraFMS/PluginTools.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 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index ec531d1d07..6652f8ce73 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.745-200529 +Version: 7.0NG.745-200530 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 e3877145f2..e79be17ff0 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.745-200529" +pandora_version="7.0NG.745-200530" 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 9e044c346c..a9931de015 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.745'; -use constant AGENT_BUILD => '200529'; +use constant AGENT_BUILD => '200530'; # 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 67ea0f6f4f..45b8fec47e 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.745 -%define release 200529 +%define release 200530 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 759d5bee6c..e79836e3aa 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.745 -%define release 200529 +%define release 200530 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 d85c535b31..33b89e31dd 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.745" -PI_BUILD="200529" +PI_BUILD="200530" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 88b83685f4..d56b83928d 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200529} +{200530} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 3371464e67..1d329d9b16 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.745(Build 200529)") +#define PANDORA_VERSION ("7.0NG.745(Build 200530)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index ef578d8b5f..a62b2887a6 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.745(Build 200529))" + VALUE "ProductVersion", "(7.0NG.745(Build 200530))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 3424e60c22..cb7471402a 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.745-200529 +Version: 7.0NG.745-200530 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 c051677115..0cc5a23594 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.745-200529" +pandora_version="7.0NG.745-200530" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index baaa48f0a0..3adf2dd64b 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC200529'; +$build_version = 'PC200530'; $pandora_version = 'v7.0NG.745'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 367a819bc1..38e513831a 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 7016e56b6a..d86abd1091 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.745 -%define release 200529 +%define release 200530 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 2e5d07d3ac..237d306f66 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.745 -%define release 200529 +%define release 200530 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 186e086037..bae09dea16 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.745" -PI_BUILD="200529" +PI_BUILD="200530" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index cbdc8b1dc5..58e29e124b 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.745 PS200529"; +my $version = "7.0NG.745 PS200530"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 59fbb1bdc2..6de9bbb997 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.745 PS200529"; +my $version = "7.0NG.745 PS200530"; # save program name for logging my $progname = basename($0); From ab4e2bc8b110dc069810d1dc353f817e1b4574ac Mon Sep 17 00:00:00 2001 From: artica Date: Sun, 31 May 2020 01:00:14 +0200 Subject: [PATCH 059/116] 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.rhel7.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/lib/PandoraFMS/PluginTools.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 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 6652f8ce73..107f1a32b6 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.745-200530 +Version: 7.0NG.745-200531 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 e79be17ff0..fb3f8f74b6 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.745-200530" +pandora_version="7.0NG.745-200531" 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 a9931de015..2e7f0fe87a 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.745'; -use constant AGENT_BUILD => '200530'; +use constant AGENT_BUILD => '200531'; # 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 45b8fec47e..dac0bb55fb 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.745 -%define release 200530 +%define release 200531 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 e79836e3aa..21f504a218 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.745 -%define release 200530 +%define release 200531 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 33b89e31dd..be9550968d 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.745" -PI_BUILD="200530" +PI_BUILD="200531" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index d56b83928d..a63139e175 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200530} +{200531} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 1d329d9b16..baf818cc3a 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.745(Build 200530)") +#define PANDORA_VERSION ("7.0NG.745(Build 200531)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index a62b2887a6..263fb9f662 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.745(Build 200530))" + VALUE "ProductVersion", "(7.0NG.745(Build 200531))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index cb7471402a..eb8c30a5ca 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.745-200530 +Version: 7.0NG.745-200531 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 0cc5a23594..16350a9b52 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.745-200530" +pandora_version="7.0NG.745-200531" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 3adf2dd64b..6f50c2a92c 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC200530'; +$build_version = 'PC200531'; $pandora_version = 'v7.0NG.745'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 38e513831a..b37b39b37d 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index d86abd1091..047a4b4fc7 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.745 -%define release 200530 +%define release 200531 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 237d306f66..9290308486 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.745 -%define release 200530 +%define release 200531 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index bae09dea16..aa2ba4ddbd 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.745" -PI_BUILD="200530" +PI_BUILD="200531" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 58e29e124b..6b2875f59e 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.745 PS200530"; +my $version = "7.0NG.745 PS200531"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 6de9bbb997..3b9a445554 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.745 PS200530"; +my $version = "7.0NG.745 PS200531"; # save program name for logging my $progname = basename($0); From 979aa7627194615e6c6e83b57dd41789c613aeeb Mon Sep 17 00:00:00 2001 From: artica Date: Mon, 1 Jun 2020 01:00:13 +0200 Subject: [PATCH 060/116] 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.rhel7.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/lib/PandoraFMS/PluginTools.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 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 107f1a32b6..4ceab84882 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.745-200531 +Version: 7.0NG.745-200601 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 fb3f8f74b6..62bc605bd6 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.745-200531" +pandora_version="7.0NG.745-200601" 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 2e7f0fe87a..d084ab33f8 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.745'; -use constant AGENT_BUILD => '200531'; +use constant AGENT_BUILD => '200601'; # 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 dac0bb55fb..9439fd705b 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.745 -%define release 200531 +%define release 200601 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 21f504a218..66e0e668fa 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.745 -%define release 200531 +%define release 200601 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 be9550968d..5a6215f23f 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.745" -PI_BUILD="200531" +PI_BUILD="200601" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index a63139e175..3f28ca627b 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200531} +{200601} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index baf818cc3a..6f11f30dd5 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.745(Build 200531)") +#define PANDORA_VERSION ("7.0NG.745(Build 200601)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 263fb9f662..9f06aad7e1 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.745(Build 200531))" + VALUE "ProductVersion", "(7.0NG.745(Build 200601))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index eb8c30a5ca..61da5fd6a5 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.745-200531 +Version: 7.0NG.745-200601 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 16350a9b52..db0807df97 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.745-200531" +pandora_version="7.0NG.745-200601" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 6f50c2a92c..a533eafe55 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC200531'; +$build_version = 'PC200601'; $pandora_version = 'v7.0NG.745'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index b37b39b37d..db4ce09def 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 047a4b4fc7..dfd5f19ed6 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.745 -%define release 200531 +%define release 200601 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 9290308486..adad37cbde 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.745 -%define release 200531 +%define release 200601 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index aa2ba4ddbd..b8330f5252 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.745" -PI_BUILD="200531" +PI_BUILD="200601" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 6b2875f59e..0cda47d4c9 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.745 PS200531"; +my $version = "7.0NG.745 PS200601"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 3b9a445554..dd7ad0c3f8 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.745 PS200531"; +my $version = "7.0NG.745 PS200601"; # save program name for logging my $progname = basename($0); From 5055a5d41b4e24fe1b74ef530ed7c9c46b1aa005 Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 2 Jun 2020 01:00:11 +0200 Subject: [PATCH 061/116] 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.rhel7.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/lib/PandoraFMS/PluginTools.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 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 4ceab84882..0c9a2618f4 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.745-200601 +Version: 7.0NG.745-200602 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 62bc605bd6..dd0675069b 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.745-200601" +pandora_version="7.0NG.745-200602" 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 d084ab33f8..ea3f3c8031 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.745'; -use constant AGENT_BUILD => '200601'; +use constant AGENT_BUILD => '200602'; # 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 9439fd705b..541e2d39a5 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.745 -%define release 200601 +%define release 200602 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 66e0e668fa..c2258ab33a 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.745 -%define release 200601 +%define release 200602 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 5a6215f23f..08f2655bfb 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.745" -PI_BUILD="200601" +PI_BUILD="200602" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 3f28ca627b..708ea4c230 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200601} +{200602} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 6f11f30dd5..8b02f62236 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.745(Build 200601)") +#define PANDORA_VERSION ("7.0NG.745(Build 200602)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 9f06aad7e1..005711d979 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.745(Build 200601))" + VALUE "ProductVersion", "(7.0NG.745(Build 200602))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 61da5fd6a5..6b16de2508 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.745-200601 +Version: 7.0NG.745-200602 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 db0807df97..c1f0b41887 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.745-200601" +pandora_version="7.0NG.745-200602" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index a533eafe55..7e56caff42 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC200601'; +$build_version = 'PC200602'; $pandora_version = 'v7.0NG.745'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index db4ce09def..19dda24265 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index dfd5f19ed6..4079a764c1 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.745 -%define release 200601 +%define release 200602 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index adad37cbde..50f0686537 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.745 -%define release 200601 +%define release 200602 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index b8330f5252..b456070663 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.745" -PI_BUILD="200601" +PI_BUILD="200602" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 0cda47d4c9..bdb4679c4b 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.745 PS200601"; +my $version = "7.0NG.745 PS200602"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index dd7ad0c3f8..839d937db3 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.745 PS200601"; +my $version = "7.0NG.745 PS200602"; # save program name for logging my $progname = basename($0); From 7e4c1a5468907d28e8fca55aa8da31e97b80bf1c Mon Sep 17 00:00:00 2001 From: Daniel Barbero Martin Date: Tue, 2 Jun 2020 13:55:01 +0200 Subject: [PATCH 062/116] Fixed minor error open bug 500 --- pandora_console/include/class/ConsoleSupervisor.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php index 069b47b29a..2c7ae0253f 100644 --- a/pandora_console/include/class/ConsoleSupervisor.php +++ b/pandora_console/include/class/ConsoleSupervisor.php @@ -459,7 +459,9 @@ class ConsoleSupervisor /* * Check if HA status. */ - $this->checkHaStatus(); + if (enterprise_installed()) { + $this->checkHaStatus(); + } } From c127ed84f08ba710330264a63afdee3bf729dbd1 Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 2 Jun 2020 18:19:16 +0200 Subject: [PATCH 063/116] 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.rhel7.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/lib/PandoraFMS/PluginTools.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 +- 51 files changed, 59 insertions(+), 59 deletions(-) diff --git a/pandora_agents/pc/AIX/pandora_agent.conf b/pandora_agents/pc/AIX/pandora_agent.conf index eb17d47c21..d0a75daa64 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.745, AIX version +# Version 7.0NG.746, 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 51972f7e78..99c223c44b 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.745, FreeBSD Version +# Version 7.0NG.746, 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 f562ee4053..e02ab21bc0 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.745, HP-UX Version +# Version 7.0NG.746, 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 4c1178a025..8fb9619396 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.745, GNU/Linux +# Version 7.0NG.746, 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 c254df3ed4..da44447fb5 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.745, GNU/Linux +# Version 7.0NG.746, 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 46e3c5c0db..1732b09047 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.745, Solaris Version +# Version 7.0NG.746, 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 f1a79ad265..a792678b72 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.745 +# Version 7.0NG.746 # 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 b2eac4399a..1701726cac 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.745, AIX version +# Version 7.0NG.746, 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 094c2f850b..d22024a70e 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.745 +# Version 7.0NG.746 # 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 6b1779741e..be269b14bb 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.745, HPUX Version +# Version 7.0NG.746, HPUX Version # General Parameters # ================== diff --git a/pandora_agents/shellscript/linux/pandora_agent.conf b/pandora_agents/shellscript/linux/pandora_agent.conf index cb94b50604..b8e6838203 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.745 +# Version 7.0NG.746 # 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 779da4af44..a3dd4a0d2f 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.745 +# Version 7.0NG.746 # 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 fd9a754f23..c491068bf4 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.745 +# Version 7.0NG.746 # 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 934e8092c8..e0be14d00a 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.745, Solaris version +# Version 7.0NG.746, Solaris version # General Parameters # ================== diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf index 59dfa821b8..c24870acfd 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.745, AIX version +# Version 7.0NG.746, 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 0c9a2618f4..5465524609 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.745-200602 +Version: 7.0NG.746 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 dd0675069b..08218d906b 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.745-200602" +pandora_version="7.0NG.746" 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 9f1321be59..1f3c3f196a 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.745, GNU/Linux +# Version 7.0NG.746, 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 ef101119e1..5afed87d77 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.745, FreeBSD Version +# Version 7.0NG.746, 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 ac1d967039..dc16545f04 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.745, HP-UX Version +# Version 7.0NG.746, 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 7cb462f7e1..9e1bd63a83 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.745, GNU/Linux +# Version 7.0NG.746, 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 7c614a4d94..82a63a8d00 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.745, GNU/Linux +# Version 7.0NG.746, 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 e1fe45e718..36ab7779b3 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.745, NetBSD Version +# Version 7.0NG.746, 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 5855922016..b7510e704b 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.745, Solaris Version +# Version 7.0NG.746, 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 ea3f3c8031..2c038bc475 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -54,7 +54,7 @@ my $Sem = undef; # Semaphore used to control the number of threads my $ThreadSem = undef; -use constant AGENT_VERSION => '7.0NG.745'; +use constant AGENT_VERSION => '7.0NG.746'; use constant AGENT_BUILD => '200602'; # 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 541e2d39a5..69e639cf97 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.745 -%define release 200602 +%define version 7.0NG.746 +%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 c2258ab33a..4ebb2dbe84 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.745 -%define release 200602 +%define version 7.0NG.746 +%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 08f2655bfb..6b0640afd9 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.745" +PI_VERSION="7.0NG.746" PI_BUILD="200602" OS_NAME=`uname -s` diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf index 02d730f2dc..1cbeeafa0a 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-2017 Artica Soluciones Tecnologicas -# Version 7.0NG.745 +# Version 7.0NG.746 # 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 708ea4c230..6ec01dde37 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.745} +{Pandora FMS Windows Agent v7.0NG.746} 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 8b02f62236..361a3877a0 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.745(Build 200602)") +#define PANDORA_VERSION ("7.0NG.746(Build 200602)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 005711d979..23bfe985f4 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.745(Build 200602))" + VALUE "ProductVersion", "(7.0NG.746(Build 200602))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 6b16de2508..8d16177406 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.745-200602 +Version: 7.0NG.746 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 c1f0b41887..3efb30f724 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.745-200602" +pandora_version="7.0NG.746" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 7e56caff42..664b93daf5 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -21,7 +21,7 @@ * Pandora build version and version */ $build_version = 'PC200602'; -$pandora_version = 'v7.0NG.745'; +$pandora_version = 'v7.0NG.746'; // 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 19dda24265..a1d409f2e6 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -128,7 +128,7 @@
    Date: Tue, 2 Jun 2020 19:22:50 +0200 Subject: [PATCH 064/116] Updated MR version. --- pandora_console/pandoradb_data.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 9e99574399..aa7e12a0ed 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -109,7 +109,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_report_front_logo', 'images/pandora_logo_white.jpg'), ('custom_report_front_header', ''), ('custom_report_front_footer', ''), -('MR', 37), +('MR', 38), ('identification_reminder', 1), ('identification_reminder_timestamp', 0), ('current_package_enterprise', '746'), From 865e17d3f85b7f765a9916405d51a0a8cfd58324 Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 3 Jun 2020 01:00:14 +0200 Subject: [PATCH 065/116] 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.rhel7.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/lib/PandoraFMS/PluginTools.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 +- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 5465524609..aa3937a871 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.746 +Version: 7.0NG.746-200603 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 08218d906b..9c9b62478c 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.746" +pandora_version="7.0NG.746-200603" 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 2c038bc475..71cad60001 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.746'; -use constant AGENT_BUILD => '200602'; +use constant AGENT_BUILD => '200603'; # 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 69e639cf97..6bc9ef107c 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.746 -%define release 1 +%define release 200603 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 4ebb2dbe84..64d4554ea3 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.746 -%define release 1 +%define release 200603 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 6b0640afd9..f7ab15394b 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.746" -PI_BUILD="200602" +PI_BUILD="200603" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 6ec01dde37..2bbecb1297 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200602} +{200603} 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 361a3877a0..ef317f5ce2 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.746(Build 200602)") +#define PANDORA_VERSION ("7.0NG.746(Build 200603)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 23bfe985f4..6b97e160a4 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.746(Build 200602))" + VALUE "ProductVersion", "(7.0NG.746(Build 200603))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 8d16177406..0fc7f27012 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.746 +Version: 7.0NG.746-200603 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 3efb30f724..ae6f4a5504 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.746" +pandora_version="7.0NG.746-200603" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 664b93daf5..db72be6f7c 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC200602'; +$build_version = 'PC200603'; $pandora_version = 'v7.0NG.746'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index a1d409f2e6..8fc39ccb83 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 4fcecaabc0..24acfb7606 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.746 -%define release 1 +%define release 200603 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 9d6a7e679a..3cb1275165 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.746 -%define release 1 +%define release 200603 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 9609779299..77e18ca90a 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.746" -PI_BUILD="200602" +PI_BUILD="200603" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 0dccbdec3b..0dff77553f 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.746 PS200602"; +my $version = "7.0NG.746 PS200603"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 40e6f3d2d8..35dec79a90 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.746 PS200602"; +my $version = "7.0NG.746 PS200603"; # save program name for logging my $progname = basename($0); From 4c3fd21971dfe1899e938b3a2c12dffa3287b07d Mon Sep 17 00:00:00 2001 From: vanessa gil Date: Wed, 3 Jun 2020 11:00:42 +0200 Subject: [PATCH 066/116] Updated version. --- pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 a2fe08b5af..b148f0f58d 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 @@ -1342,13 +1342,13 @@ ALTER TABLE `tmap` MODIFY COLUMN `id_user` varchar(250) NOT NULL DEFAULT ''; INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge', '100'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30'); -INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 37); +INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 38); INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png'); UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager'; DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise'; -INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '745'); +INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '746'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('status_monitor_fields', 'policy,agent,data_type,module_name,server_type,interval,status,graph,warn,data,timestamp'); UPDATE `tconfig` SET `value` = 'mini_severity,evento,id_agente,estado,timestamp' WHERE `token` LIKE 'event_fields'; DELETE FROM `tconfig` WHERE `token` LIKE 'integria_api_password'; From 43701f953dae05a6d3fa39edb7ec3e91bb29687b Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Wed, 3 Jun 2020 17:37:12 +0200 Subject: [PATCH 067/116] fixed ad authentication --- pandora_console/include/auth/mysql.php | 45 ++++++++++++++------------ 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php index ed5e56782a..064be4a93e 100644 --- a/pandora_console/include/auth/mysql.php +++ b/pandora_console/include/auth/mysql.php @@ -85,7 +85,7 @@ function process_user_login($login, $pass, $api=false) return process_user_login_local($login, $pass, $api); } else { $login_remote = process_user_login_remote($login, io_safe_output($pass), $api); - if ($login_remote == false) { + if ($login_remote == false && $config['fallback_local_auth']) { return process_user_login_local($login, $pass, $api); } else { return $login_remote; @@ -258,27 +258,32 @@ function process_user_login_remote($login, $pass, $api=false) return false; } - if (($config['auth'] === 'ad') - && (isset($config['ad_advanced_config']) && $config['ad_advanced_config']) - ) { - $return = enterprise_hook( - 'prepare_permissions_groups_of_user_ad', - [ - $login, - $pass, - false, - true, - defined('METACONSOLE'), - ] - ); + if (($config['auth'] === 'ad')) { + // Check if autocreate remote users is active. + if ($config['autocreate_remote_users'] == 1) { + change_local_user_pass_ldap($login, $pass); + } - if ($return === 'error_permissions') { - $config['auth_error'] = __('Problems with configuration permissions. Please contact with Administrator'); - return false; - } else { - if ($return === 'permissions_changed') { - $config['auth_error'] = __('Your permissions have changed. Please, login again.'); + if (isset($config['ad_advanced_config']) && $config['ad_advanced_config']) { + $return = enterprise_hook( + 'prepare_permissions_groups_of_user_ad', + [ + $login, + $pass, + false, + true, + defined('METACONSOLE'), + ] + ); + + if ($return === 'error_permissions') { + $config['auth_error'] = __('Problems with configuration permissions. Please contact with Administrator'); return false; + } else { + if ($return === 'permissions_changed') { + $config['auth_error'] = __('Your permissions have changed. Please, login again.'); + return false; + } } } } else if ($config['auth'] === 'ldap') { From 0bd255924f4a0ac46a6211ad73e231bb377f01b7 Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 4 Jun 2020 01:00:16 +0200 Subject: [PATCH 068/116] 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.rhel7.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/lib/PandoraFMS/PluginTools.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 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index aa3937a871..a4d1533cc0 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.746-200603 +Version: 7.0NG.746-200604 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 9c9b62478c..e90002d182 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.746-200603" +pandora_version="7.0NG.746-200604" 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 71cad60001..12bfe89f86 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.746'; -use constant AGENT_BUILD => '200603'; +use constant AGENT_BUILD => '200604'; # 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 6bc9ef107c..9e4e2e3e73 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.746 -%define release 200603 +%define release 200604 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 64d4554ea3..ed5e222ba9 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.746 -%define release 200603 +%define release 200604 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 f7ab15394b..689c072d56 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.746" -PI_BUILD="200603" +PI_BUILD="200604" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 2bbecb1297..4a41758591 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200603} +{200604} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index ef317f5ce2..10630b3ed7 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.746(Build 200603)") +#define PANDORA_VERSION ("7.0NG.746(Build 200604)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 6b97e160a4..38aa2f163a 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.746(Build 200603))" + VALUE "ProductVersion", "(7.0NG.746(Build 200604))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 0fc7f27012..9767c83385 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.746-200603 +Version: 7.0NG.746-200604 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 ae6f4a5504..491290e22e 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.746-200603" +pandora_version="7.0NG.746-200604" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index db72be6f7c..6b16cac79a 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC200603'; +$build_version = 'PC200604'; $pandora_version = 'v7.0NG.746'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 8fc39ccb83..948f2258e8 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 24acfb7606..84e4e78993 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.746 -%define release 200603 +%define release 200604 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 3cb1275165..379404429f 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.746 -%define release 200603 +%define release 200604 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 77e18ca90a..b812a576e3 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.746" -PI_BUILD="200603" +PI_BUILD="200604" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 0dff77553f..aec504351b 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.746 PS200603"; +my $version = "7.0NG.746 PS200604"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 35dec79a90..cc7afc4a1f 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.746 PS200603"; +my $version = "7.0NG.746 PS200604"; # save program name for logging my $progname = basename($0); From c8d8b1a3125f63e588134e35e0bba1d3097a60af Mon Sep 17 00:00:00 2001 From: artica Date: Fri, 5 Jun 2020 01:00:17 +0200 Subject: [PATCH 069/116] 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.rhel7.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/lib/PandoraFMS/PluginTools.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 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index a4d1533cc0..a71231e1e0 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.746-200604 +Version: 7.0NG.746-200605 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 e90002d182..e7cebce719 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.746-200604" +pandora_version="7.0NG.746-200605" 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 12bfe89f86..a0b6fca01d 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.746'; -use constant AGENT_BUILD => '200604'; +use constant AGENT_BUILD => '200605'; # 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 9e4e2e3e73..babf0b6103 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.746 -%define release 200604 +%define release 200605 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 ed5e222ba9..ce52b66743 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.746 -%define release 200604 +%define release 200605 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 689c072d56..97f89b4094 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.746" -PI_BUILD="200604" +PI_BUILD="200605" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 4a41758591..7315981b8f 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200604} +{200605} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 10630b3ed7..1e243f6935 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.746(Build 200604)") +#define PANDORA_VERSION ("7.0NG.746(Build 200605)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 38aa2f163a..714e5a1672 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.746(Build 200604))" + VALUE "ProductVersion", "(7.0NG.746(Build 200605))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 9767c83385..c65042ded3 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.746-200604 +Version: 7.0NG.746-200605 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 491290e22e..9f3f0070ba 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.746-200604" +pandora_version="7.0NG.746-200605" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 6b16cac79a..33cf5b74f6 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC200604'; +$build_version = 'PC200605'; $pandora_version = 'v7.0NG.746'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 948f2258e8..357c1bbfe1 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 84e4e78993..faa610a675 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.746 -%define release 200604 +%define release 200605 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 379404429f..637df12096 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.746 -%define release 200604 +%define release 200605 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index b812a576e3..17fb278f4e 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.746" -PI_BUILD="200604" +PI_BUILD="200605" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index aec504351b..4f6d741673 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.746 PS200604"; +my $version = "7.0NG.746 PS200605"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index cc7afc4a1f..11dd17de30 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.746 PS200604"; +my $version = "7.0NG.746 PS200605"; # save program name for logging my $progname = basename($0); From cc83ae35df5e8b861c78318d92b409046b93e8bd Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 6 Jun 2020 01:00:17 +0200 Subject: [PATCH 070/116] 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.rhel7.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/lib/PandoraFMS/PluginTools.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 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index a71231e1e0..ae23669da3 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.746-200605 +Version: 7.0NG.746-200606 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 e7cebce719..2ed2171e78 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.746-200605" +pandora_version="7.0NG.746-200606" 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 a0b6fca01d..93f7f07de8 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.746'; -use constant AGENT_BUILD => '200605'; +use constant AGENT_BUILD => '200606'; # 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 babf0b6103..367613bf8f 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.746 -%define release 200605 +%define release 200606 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 ce52b66743..4c315f969a 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.746 -%define release 200605 +%define release 200606 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 97f89b4094..d489f735b8 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.746" -PI_BUILD="200605" +PI_BUILD="200606" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 7315981b8f..c14b80ec5c 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200605} +{200606} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 1e243f6935..e3aca7e17f 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.746(Build 200605)") +#define PANDORA_VERSION ("7.0NG.746(Build 200606)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 714e5a1672..a40bfea86f 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.746(Build 200605))" + VALUE "ProductVersion", "(7.0NG.746(Build 200606))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index c65042ded3..20dd24c444 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.746-200605 +Version: 7.0NG.746-200606 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 9f3f0070ba..c349d42ade 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.746-200605" +pandora_version="7.0NG.746-200606" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 33cf5b74f6..74b6abd80c 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC200605'; +$build_version = 'PC200606'; $pandora_version = 'v7.0NG.746'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 357c1bbfe1..a4eafc1e66 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index faa610a675..e59a4f2474 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.746 -%define release 200605 +%define release 200606 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 637df12096..62b9c5b2f6 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.746 -%define release 200605 +%define release 200606 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 17fb278f4e..ee6632ed8f 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.746" -PI_BUILD="200605" +PI_BUILD="200606" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 4f6d741673..3f21de9a78 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.746 PS200605"; +my $version = "7.0NG.746 PS200606"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 11dd17de30..69b868303f 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.746 PS200605"; +my $version = "7.0NG.746 PS200606"; # save program name for logging my $progname = basename($0); From 78e8ef2711f7289986721e9d6da44595a065d60c Mon Sep 17 00:00:00 2001 From: artica Date: Sun, 7 Jun 2020 01:00:15 +0200 Subject: [PATCH 071/116] 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.rhel7.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/lib/PandoraFMS/PluginTools.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 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index ae23669da3..cd7ad5d579 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.746-200606 +Version: 7.0NG.746-200607 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 2ed2171e78..e3247538a6 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.746-200606" +pandora_version="7.0NG.746-200607" 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 93f7f07de8..0fa55a5ad4 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.746'; -use constant AGENT_BUILD => '200606'; +use constant AGENT_BUILD => '200607'; # 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 367613bf8f..867ea2f914 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.746 -%define release 200606 +%define release 200607 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 4c315f969a..6939d751f8 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.746 -%define release 200606 +%define release 200607 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 d489f735b8..261d09882f 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.746" -PI_BUILD="200606" +PI_BUILD="200607" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index c14b80ec5c..c3c8d5e39f 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200606} +{200607} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index e3aca7e17f..764bd98a5b 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.746(Build 200606)") +#define PANDORA_VERSION ("7.0NG.746(Build 200607)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index a40bfea86f..eb45f021ce 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.746(Build 200606))" + VALUE "ProductVersion", "(7.0NG.746(Build 200607))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 20dd24c444..544d65c9e7 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.746-200606 +Version: 7.0NG.746-200607 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 c349d42ade..fb8ebf3755 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.746-200606" +pandora_version="7.0NG.746-200607" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 74b6abd80c..f55928a040 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC200606'; +$build_version = 'PC200607'; $pandora_version = 'v7.0NG.746'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index a4eafc1e66..eb20ab0740 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index e59a4f2474..5789f503ef 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.746 -%define release 200606 +%define release 200607 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 62b9c5b2f6..6405921ef3 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.746 -%define release 200606 +%define release 200607 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index ee6632ed8f..e43e0ab828 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.746" -PI_BUILD="200606" +PI_BUILD="200607" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 3f21de9a78..6507de6e01 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.746 PS200606"; +my $version = "7.0NG.746 PS200607"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 69b868303f..117a2fb08e 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.746 PS200606"; +my $version = "7.0NG.746 PS200607"; # save program name for logging my $progname = basename($0); From 9a7035d014bc7a316b82d914c0be55c85ded782d Mon Sep 17 00:00:00 2001 From: artica Date: Mon, 8 Jun 2020 01:00:14 +0200 Subject: [PATCH 072/116] 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.rhel7.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/lib/PandoraFMS/PluginTools.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 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index cd7ad5d579..0dd301b279 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.746-200607 +Version: 7.0NG.746-200608 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 e3247538a6..d50e91910f 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.746-200607" +pandora_version="7.0NG.746-200608" 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 0fa55a5ad4..162d35a9fa 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.746'; -use constant AGENT_BUILD => '200607'; +use constant AGENT_BUILD => '200608'; # 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 867ea2f914..ca8cbadcd7 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.746 -%define release 200607 +%define release 200608 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 6939d751f8..65a10b77a2 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.746 -%define release 200607 +%define release 200608 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 261d09882f..d364284eb7 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.746" -PI_BUILD="200607" +PI_BUILD="200608" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index c3c8d5e39f..1bfa0b58a2 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200607} +{200608} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 764bd98a5b..bd048d925b 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.746(Build 200607)") +#define PANDORA_VERSION ("7.0NG.746(Build 200608)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index eb45f021ce..83c10b276a 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.746(Build 200607))" + VALUE "ProductVersion", "(7.0NG.746(Build 200608))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 544d65c9e7..6fb556e0d4 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.746-200607 +Version: 7.0NG.746-200608 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 fb8ebf3755..6d9c01a1af 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.746-200607" +pandora_version="7.0NG.746-200608" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index f55928a040..1091b024d2 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC200607'; +$build_version = 'PC200608'; $pandora_version = 'v7.0NG.746'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index eb20ab0740..7ccfa3ff85 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 5789f503ef..e293a8ba15 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.746 -%define release 200607 +%define release 200608 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 6405921ef3..331187a494 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.746 -%define release 200607 +%define release 200608 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index e43e0ab828..c958c422de 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.746" -PI_BUILD="200607" +PI_BUILD="200608" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 6507de6e01..354ea2905e 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.746 PS200607"; +my $version = "7.0NG.746 PS200608"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 117a2fb08e..3d76f3c082 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.746 PS200607"; +my $version = "7.0NG.746 PS200608"; # save program name for logging my $progname = basename($0); From c6b1e92bda7de0322c97e55d2116721c84f0f0ae Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Mon, 8 Jun 2020 08:44:24 +0200 Subject: [PATCH 073/116] Modified match for forbidden words. Now not allows spaces or scaped chars. Other cases must not be problemathic --- pandora_console/include/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 724fe11fd6..8805a0b1e2 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -2136,7 +2136,7 @@ function check_sql($sql) { // We remove "*" to avoid things like SELECT * FROM tusuario // Check that it not delete_ as "delete_pending" (this is a common field in pandora tables). - if (preg_match('/\*|delete[^_]|drop|alter|modify|password|pass|insert|update/i', $sql)) { + if (preg_match('/([ ]*(delete|drop|alter|modify|password|pass|insert|update)\b[ \\]+)/i', $sql)) { return ''; } From b9d5ab9c4a2d7bf41ddb117f7a3873a3f06e3499 Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 8 Jun 2020 11:24:46 +0200 Subject: [PATCH 074/116] Fixed errors new tab base64 image --- pandora_console/include/ajax/module.php | 9 ++++++++- pandora_console/include/javascript/pandora.js | 6 ++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index fae72f34fa..ed6d72ef70 100755 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -372,7 +372,13 @@ if (check_login()) { $data[] = date('d F Y h:i:s A', $row['utimestamp']); } else if (is_snapshot_data($row[$attr[0]])) { if ($config['command_snapshot']) { - $data[] = ""; + $imagetab = ''; + $image = ''; + $data[] = ''.$image.''; } else { $data[] = ''.wordwrap(io_safe_input($row[$attr[0]]), 60, "
    \n", true).'    '; } @@ -1099,6 +1105,7 @@ if (check_login()) { $rowIndex++; } + ui_require_javascript_file('pandora.js'); ?> '; From 11dbe46a96a82aff3a4ae5c5af469fd1bf21f816 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Mon, 8 Jun 2020 15:23:09 +0200 Subject: [PATCH 076/116] Allowed toggled rows --- .../godmode/wizards/Wizard.main.php | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pandora_console/godmode/wizards/Wizard.main.php b/pandora_console/godmode/wizards/Wizard.main.php index 7320934826..9af64a7c39 100644 --- a/pandora_console/godmode/wizards/Wizard.main.php +++ b/pandora_console/godmode/wizards/Wizard.main.php @@ -832,7 +832,7 @@ class Wizard $first_block_printed = true; } - $output .= '
    '; + $row_output = '
    '; foreach ($row['columns'] as $column) { $width = isset($column['width']) ? 'width: '.$column['width'].';' : 'width: 100%;'; @@ -841,23 +841,36 @@ class Wizard $extra_styles = isset($column['style']) ? $column['style'] : ''; $class = isset($column['class']) ? $column['class'] : ''; - $output .= '
    '; + $row_output .= '
    '; foreach ($column['inputs'] as $input) { if (is_array($input)) { if ($input['arguments']['type'] != 'submit') { - $output .= $this->printBlockAsGrid($input, true); + $row_output .= $this->printBlockAsGrid($input, true); } else { $output_submit .= $this->printBlockAsGrid($input, true); } } else { - $output .= $input; + $row_output .= $input; } } - $output .= '
    '; + $row_output .= '
    '; + } + + if (isset($row['toggle'])) { + $output .= ui_print_toggle( + [ + 'content' => $row_output, + 'name' => $row['toggle_label'], + 'hidden_default' => ! (bool) $row['toggle'], + 'return' => true, + ] + ); + } else { + $output .= $row_output; } $output .= '
    '; From 754023f90891ded8107f22a156cb442311b9d2c8 Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Mon, 8 Jun 2020 17:12:33 +0200 Subject: [PATCH 077/116] fix XSS --- pandora_console/godmode/wizards/HostDevices.class.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pandora_console/godmode/wizards/HostDevices.class.php b/pandora_console/godmode/wizards/HostDevices.class.php index 9cb9505a5b..80810b7cf2 100755 --- a/pandora_console/godmode/wizards/HostDevices.class.php +++ b/pandora_console/godmode/wizards/HostDevices.class.php @@ -692,9 +692,7 @@ class HostDevices extends Wizard if ($this->page == 1) { $title = __( '"%s" features', - io_safe_output( - $this->task['name'] - ) + $this->task['name'] ); } From 120b78b5c55126a41eb04e3f4c967a59749c4310 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Mon, 8 Jun 2020 17:36:32 +0200 Subject: [PATCH 078/116] Control vulnerable fields --- pandora_console/godmode/tag/edit_tag.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pandora_console/godmode/tag/edit_tag.php b/pandora_console/godmode/tag/edit_tag.php index 2db4cfed33..96b4e158e3 100644 --- a/pandora_console/godmode/tag/edit_tag.php +++ b/pandora_console/godmode/tag/edit_tag.php @@ -31,11 +31,10 @@ $id_tag = (int) get_parameter('id_tag', 0); $update_tag = (int) get_parameter('update_tag', 0); $create_tag = (int) get_parameter('create_tag', 0); $name_tag = (string) get_parameter('name_tag', ''); -$description_tag = (string) get_parameter('description_tag', ''); -$description_tag = io_safe_input(strip_tags(io_safe_output($description_tag))); +$description_tag = io_safe_input(strip_tags(io_safe_output((string) get_parameter('description_tag')))); $url_tag = (string) get_parameter('url_tag', ''); -$email_tag = (string) get_parameter('email_tag', ''); -$phone_tag = (string) get_parameter('phone_tag', ''); +$email_tag = io_safe_input(strip_tags(io_safe_output(((string) get_parameter('email_tag'))))); +$phone_tag = io_safe_input(strip_tags(io_safe_output(((string) get_parameter('phone_tag'))))); $tab = (string) get_parameter('tab', 'list'); if (defined('METACONSOLE')) { From a30f73d6c2970b4c921e58e5b4468bda77b7ca04 Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 9 Jun 2020 01:00:18 +0200 Subject: [PATCH 079/116] 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.rhel7.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/lib/PandoraFMS/PluginTools.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 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 0dd301b279..91f1551288 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.746-200608 +Version: 7.0NG.746-200609 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 d50e91910f..b7d12ad61d 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.746-200608" +pandora_version="7.0NG.746-200609" 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 162d35a9fa..8e7691ae39 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.746'; -use constant AGENT_BUILD => '200608'; +use constant AGENT_BUILD => '200609'; # 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 ca8cbadcd7..3ee225b4d2 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.746 -%define release 200608 +%define release 200609 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 65a10b77a2..5d86f42c13 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.746 -%define release 200608 +%define release 200609 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 d364284eb7..9a0b6c68ab 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.746" -PI_BUILD="200608" +PI_BUILD="200609" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 1bfa0b58a2..6a7e527c5f 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200608} +{200609} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index bd048d925b..4a74065ff8 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.746(Build 200608)") +#define PANDORA_VERSION ("7.0NG.746(Build 200609)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 83c10b276a..8420db0322 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.746(Build 200608))" + VALUE "ProductVersion", "(7.0NG.746(Build 200609))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 6fb556e0d4..6fc8c22bb2 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.746-200608 +Version: 7.0NG.746-200609 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 6d9c01a1af..0c5a4417bb 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.746-200608" +pandora_version="7.0NG.746-200609" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 1091b024d2..786ac47d9f 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC200608'; +$build_version = 'PC200609'; $pandora_version = 'v7.0NG.746'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 7ccfa3ff85..77eb8b9e7a 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index e293a8ba15..80d1ade9ea 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.746 -%define release 200608 +%define release 200609 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 331187a494..52f0f55f79 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.746 -%define release 200608 +%define release 200609 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index c958c422de..fb0959023f 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.746" -PI_BUILD="200608" +PI_BUILD="200609" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 354ea2905e..c2201aaf14 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.746 PS200608"; +my $version = "7.0NG.746 PS200609"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 3d76f3c082..856f5ee22e 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.746 PS200608"; +my $version = "7.0NG.746 PS200609"; # save program name for logging my $progname = basename($0); From 73cf98fc02d03b13586f8d5cb77b2c7091b84325 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Tue, 9 Jun 2020 10:22:54 +0200 Subject: [PATCH 080/116] Cleaned tags for affected fields --- pandora_console/include/functions_config.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 96f266fc1e..b7d23fbb7d 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -1212,8 +1212,8 @@ function config_update_config() // -------------------------------------------------- // CUSTOM VALUES POST PROCESS // -------------------------------------------------- - $custom_value = get_parameter('custom_value'); - $custom_text = get_parameter('custom_text'); + $custom_value = io_safe_input(strip_tags(io_safe_output(get_parameter('custom_value')))); + $custom_text = io_safe_input(strip_tags(io_safe_output(get_parameter('custom_text')))); $custom_value_add = (bool) get_parameter('custom_value_add', 0); $custom_value_to_delete = get_parameter('custom_value_to_delete', 0); @@ -1284,8 +1284,8 @@ function config_update_config() // -------------------------------------------------- // MODULE CUSTOM UNITS // -------------------------------------------------- - $custom_unit = get_parameter('custom_module_unit'); - $custom_unit_to_delete = get_parameter('custom_module_unit_to_delete', ''); + $custom_unit = io_safe_input(strip_tags(io_safe_output(get_parameter('custom_module_unit')))); + $custom_unit_to_delete = io_safe_input(strip_tags(io_safe_output(get_parameter('custom_module_unit_to_delete', '')))); if (!empty($custom_unit)) { if (!add_custom_module_unit( From cfe30d5b7d5431141b211fa8666bde6fe7f8b4cf Mon Sep 17 00:00:00 2001 From: marcos Date: Tue, 9 Jun 2020 10:37:11 +0200 Subject: [PATCH 081/116] fixed vulnerability on special days --- .../godmode/alerts/alert_special_days.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/alerts/alert_special_days.php b/pandora_console/godmode/alerts/alert_special_days.php index 7dd02c28bd..d3f2c41ed1 100644 --- a/pandora_console/godmode/alerts/alert_special_days.php +++ b/pandora_console/godmode/alerts/alert_special_days.php @@ -118,6 +118,10 @@ if ($create_special_day) { $values['id_group'] = (string) get_parameter('id_group'); $values['description'] = (string) get_parameter('description'); + $aviable_description = true; + if (preg_match('