diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index dd9a985b2a..93182e14f0 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1015,7 +1015,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.758.1'; -use constant AGENT_BUILD => '211123'; +use constant AGENT_BUILD => '211124'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 4b9eb3b45f..ff4c5d907b 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.758.1" -PI_BUILD="211123" +PI_BUILD="211124" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 482887f788..fa1085d1f9 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{211123} +{211124} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 70b96f6105..5672b0027c 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.758.1 Build 211123") +#define PANDORA_VERSION ("7.0NG.758.1 Build 211124") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 01329528c1..2173a630bb 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.758.1(Build 211123))" + VALUE "ProductVersion", "(7.0NG.758.1(Build 211124))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 7ef7781787..81d3f45bd2 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 = 'PC211123'; +$build_version = 'PC211124'; $pandora_version = 'v7.0NG.758.1'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 70aceab133..f561705896 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -1574,7 +1574,9 @@ function graphic_combined_module( $date_array['final_date'] = $params['date']; $date_array['start_date'] = ($params['date'] - $params['period']); - $server_name = metaconsole_get_server_by_id($modules[0]['server']); + if (is_metaconsole()) { + $server_name = metaconsole_get_server_by_id($modules[0]['server']); + } if ($params_combined['projection']) { $output_projection = forecast_projection_graph( diff --git a/pandora_console/install.php b/pandora_console/install.php index 58daf611e0..8be5d1da62 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
style[0] = 'width: 33%; padding-right: 50px; padding-left: 100px;'; $table->style[1] = 'width: 33%; padding-right: 50px; padding-left: 50px;'; $table->style[2] = 'width: 33%; padding-right: 100px; padding-left: 50px;'; $table->colspan[0][0] = 2; -$table->colspan[3][0] = 3; -$table->colspan[5][0] = 3; +$table->colspan[4][0] = 3; +$table->colspan[6][0] = 3; $help_macros = isset($_GET['from_event']) ? ui_print_help_icon('response_macros', true) : ''; @@ -174,6 +189,7 @@ if ($update) { $input_value_criticity = $incident_details[7]; $input_value_owner = $incident_details[5]; $input_value_content = $incident_details[4]; + $input_value_resolution = $incident_details[12]; } else if (isset($_GET['from_event'])) { $input_value_title = $config['cr_incident_title']; $input_value_type = $config['cr_incident_type']; @@ -182,6 +198,7 @@ if ($update) { $input_value_criticity = $config['cr_default_criticity']; $input_value_owner = $config['cr_default_owner']; $input_value_content = $config['cr_incident_content']; + $input_value_resolution = 0; } else { $input_value_title = ''; $input_value_type = ''; @@ -190,6 +207,7 @@ if ($update) { $input_value_criticity = ''; $input_value_owner = ''; $input_value_content = ''; + $input_value_resolution = 0; } $table->data[0][0] = '

'.__('Title').': '.$help_macros.'

'; @@ -303,8 +321,26 @@ $table->data[2][2] .= '
'.html_print_autocomplet 'w100p' ).'
'; -$table->data[3][0] = '

'.__('Description').': '.$help_macros.'

'; -$table->data[3][0] .= '
'.html_print_textarea( + +$table->data[3][0] = '

'.__('Resolution').':

'; + +$table->data[3][0] .= '
'.html_print_select( + $integria_resolution_values, + 'resolution', + $input_value_resolution, + '', + '', + 1, + true, + false, + true, + '', + false, + 'width: 100%;' +).'
'; + +$table->data[4][0] = '

'.__('Description').': '.$help_macros.'

'; +$table->data[4][0] .= '
'.html_print_textarea( 'incident_content', 3, 20, @@ -313,10 +349,10 @@ $table->data[3][0] .= '
'.html_print_textarea( true ).'
'; -$table->data[4][0] = '

'.__('File name').':

'; -$table->data[4][0] .= html_print_input_file('userfile', true); -$table->data[5][0] = '

'.__('Attachment description').':

'; -$table->data[5][0] .= html_print_textarea( +$table->data[5][0] = '

'.__('File name').':

'; +$table->data[5][0] .= html_print_input_file('userfile', true); +$table->data[6][0] = '

'.__('Attachment description').':

'; +$table->data[6][0] .= html_print_textarea( 'file_description', 3, 20, @@ -345,3 +381,32 @@ if ($update) { } echo '
'; +?> + + diff --git a/pandora_console/operation/reporting/graph_viewer.php b/pandora_console/operation/reporting/graph_viewer.php index c35f450261..549c7ba08e 100644 --- a/pandora_console/operation/reporting/graph_viewer.php +++ b/pandora_console/operation/reporting/graph_viewer.php @@ -48,7 +48,7 @@ if ($id_graph !== 0) { } } -// Delete module SQL code +// Delete module SQL code. if ($delete_graph) { if (check_acl($config['id_user'], 0, 'AW')) { $res = db_process_sql_delete('tgraph_source', ['id_graph' => $id_graph]); @@ -239,7 +239,7 @@ if ($view_graph) { ] ).''; - // In full screen, the manage options are not available + // In full screen, the manage options are not available. $options = [ 'view' => $options['view'], 'screen' => $options['screen'], @@ -277,6 +277,12 @@ if ($view_graph) { 'fullscale' => $fullscale, ]; + if ($stacked === CUSTOM_GRAPH_AREA || $stacked === CUSTOM_GRAPH_STACKED_AREA) { + $params['type_graph'] = 'area'; + } else if ($stacked === CUSTOM_GRAPH_LINE || $stacked === CUSTOM_GRAPH_STACKED_LINE) { + $params['type_graph'] = 'line'; + } + $params_combined = [ 'stacked' => $stacked, 'id_graph' => $id_graph, diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index 56fd494a1a..62bfe45e52 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -46,7 +46,7 @@ our @EXPORT = qw( # version: Defines actual version of Pandora Server for this module only my $pandora_version = "7.0NG.758.1"; -my $pandora_build = "211123"; +my $pandora_build = "211124"; our $VERSION = $pandora_version." ".$pandora_build; # Setup hash diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm index 05b488953f..f892cf5326 100644 --- a/pandora_server/lib/PandoraFMS/PluginTools.pm +++ b/pandora_server/lib/PandoraFMS/PluginTools.pm @@ -34,7 +34,7 @@ our @ISA = qw(Exporter); # version: Defines actual version of Pandora Server for this module only my $pandora_version = "7.0NG.758.1"; -my $pandora_build = "211123"; +my $pandora_build = "211124"; our $VERSION = $pandora_version." ".$pandora_build; our %EXPORT_TAGS = ( 'all' => [ qw() ] ); diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index f11e995164..46256d0e9f 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.758.1" -PI_BUILD="211123" +PI_BUILD="211124" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 4e9660bfb4..c74711afa5 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.758.1 Build 211123"; +my $version = "7.0NG.758.1 Build 211124"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 7318984a42..72d75059b5 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.758.1 Build 211123"; +my $version = "7.0NG.758.1 Build 211124"; # save program name for logging my $progname = basename($0); @@ -1004,7 +1004,7 @@ sub pandora_get_same_day_id ($$) { my %weeks = ('monday' => 1, 'tuesday' => 2, 'wednesday' => 3, 'thursday' => 4, 'friday' => 5, 'saturday' => 6, 'sunday' => 7, 'holiday' => 8); - return defined ($weeks{$same_day}) ? $weeks{$same_day} : -1; + return defined ($weeks->{$same_day}) ? $weeks->{$same_day} : -1; } ##########################################################################