From 329cafad4999ac325cb01768d2dd67767e21e65b Mon Sep 17 00:00:00 2001 From: "marcos.alconada" Date: Wed, 11 Sep 2019 10:04:18 +0200 Subject: [PATCH 01/16] fixed fixed error on stop_downtime --- pandora_server/util/pandora_manage.pl | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 98cca10392..8243053c37 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -4818,6 +4818,25 @@ sub cli_stop_downtime () { my $current_time = time; my $downtime_date_to = get_db_value ($dbh, 'SELECT date_to FROM tplanned_downtime WHERE id=?', $downtime_id); + my $type_execution = get_db_value ($dbh, 'SELECT type_execution FROM tplanned_downtime WHERE id=?', $downtime_id); + + if($type_execution eq 'periodically'){ + + my $downtime_running = get_db_value ($dbh, 'SELECT executed FROM tplanned_downtime WHERE id=?', $downtime_id); + if($downtime_running == 1){ + print_log "[INFO] Planned_downtime '$downtime_name' can't be stopped\n\n"; + exit; + } + } + + + + if($current_time >= $downtime_date_to) { + print_log "[INFO] Planned_downtime '$downtime_name' is already stopped\n\n"; + exit; + } + + if($current_time >= $downtime_date_to) { print_log "[INFO] Planned_downtime '$downtime_name' is already stopped\n\n"; exit; From d2b7ec7a6f7200f22cb9830ba6eefa575bdaf9d1 Mon Sep 17 00:00:00 2001 From: "marcos.alconada" Date: Wed, 11 Sep 2019 10:06:08 +0200 Subject: [PATCH 02/16] deleted duplicated code --- pandora_server/util/pandora_manage.pl | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 8243053c37..d0a6d890cd 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -4829,14 +4829,6 @@ sub cli_stop_downtime () { } } - - - if($current_time >= $downtime_date_to) { - print_log "[INFO] Planned_downtime '$downtime_name' is already stopped\n\n"; - exit; - } - - if($current_time >= $downtime_date_to) { print_log "[INFO] Planned_downtime '$downtime_name' is already stopped\n\n"; exit; From 64e69da924f70785c256e2ade191d52750bba3fe Mon Sep 17 00:00:00 2001 From: "marcos.alconada" Date: Wed, 11 Sep 2019 11:41:14 +0200 Subject: [PATCH 03/16] simplify code --- pandora_server/util/pandora_manage.pl | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index d0a6d890cd..c1a87d6454 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -4818,17 +4818,14 @@ sub cli_stop_downtime () { my $current_time = time; my $downtime_date_to = get_db_value ($dbh, 'SELECT date_to FROM tplanned_downtime WHERE id=?', $downtime_id); - my $type_execution = get_db_value ($dbh, 'SELECT type_execution FROM tplanned_downtime WHERE id=?', $downtime_id); - - if($type_execution eq 'periodically'){ + my $data = get_db_single_row ($dbh, 'SELECT type_execution, executed FROM tplanned_downtime WHERE id=?', $downtime_id); - my $downtime_running = get_db_value ($dbh, 'SELECT executed FROM tplanned_downtime WHERE id=?', $downtime_id); - if($downtime_running == 1){ - print_log "[INFO] Planned_downtime '$downtime_name' can't be stopped\n\n"; + if( $data->{'type_execution'} eq 'periodically' && $data->{'executed'} == 1){ + print_log "[ERROR] Planned_downtime '$downtime_name' cannot be stopped.\n"; + print_log "[INFO] Periodical and running planned downtime cannot be stopped.\n\n"; exit; - } } - + if($current_time >= $downtime_date_to) { print_log "[INFO] Planned_downtime '$downtime_name' is already stopped\n\n"; exit; From 47b61a20255165376045b2c6e87a63a38594bd0e Mon Sep 17 00:00:00 2001 From: "marcos.alconada" Date: Wed, 11 Sep 2019 12:36:15 +0200 Subject: [PATCH 04/16] refactor --stop_downtime --- pandora_server/util/pandora_manage.pl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index c1a87d6454..3bd8012dfe 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -4816,9 +4816,8 @@ sub cli_stop_downtime () { exist_check($downtime_id,'planned downtime',$downtime_id); my $current_time = time; - my $downtime_date_to = get_db_value ($dbh, 'SELECT date_to FROM tplanned_downtime WHERE id=?', $downtime_id); - my $data = get_db_single_row ($dbh, 'SELECT type_execution, executed FROM tplanned_downtime WHERE id=?', $downtime_id); + my $data = get_db_single_row ($dbh, 'SELECT date_to, type_execution, executed FROM tplanned_downtime WHERE id=?', $downtime_id); if( $data->{'type_execution'} eq 'periodically' && $data->{'executed'} == 1){ print_log "[ERROR] Planned_downtime '$downtime_name' cannot be stopped.\n"; @@ -4826,7 +4825,7 @@ sub cli_stop_downtime () { exit; } - if($current_time >= $downtime_date_to) { + if($current_time >= $data->{'date_to'}) { print_log "[INFO] Planned_downtime '$downtime_name' is already stopped\n\n"; exit; } From dd2ace99e12f8b976a4f4f658f2ada8dd91b3c71 Mon Sep 17 00:00:00 2001 From: Tatiana Llorente Date: Fri, 11 Oct 2019 13:51:52 +0200 Subject: [PATCH 05/16] Check permissions to reset a network map - #4728 --- .../include/class/NetworkMap.class.php | 10 ++++++++ .../functions_pandora_networkmap.js | 23 +++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/class/NetworkMap.class.php b/pandora_console/include/class/NetworkMap.class.php index 0011167308..505d057665 100644 --- a/pandora_console/include/class/NetworkMap.class.php +++ b/pandora_console/include/class/NetworkMap.class.php @@ -2642,8 +2642,17 @@ class NetworkMap */ public function loadMapData() { + global $config; + $networkmap = $this->map; + // ACL. + $networkmap_write = check_acl( + $config['id_user'], + $networkmap['id_group'], + 'MW' + ); + $simulate = false; if (isset($networkmap['__simulated']) === false) { $networkmap['filter'] = json_decode( @@ -2711,6 +2720,7 @@ class NetworkMap $output .= 'var networkmap_center = [ '.$networkmap['center_x'].', '.$networkmap['center_y']."];\n"; $output .= 'var networkmap_dimensions = [ '.$networkmap['width'].', '.$networkmap['height']."];\n"; $output .= 'var enterprise_installed = '.((int) enterprise_installed()).";\n"; + $output .= 'var networkmap_write = '.$networkmap_write.";\n"; $output .= 'var node_radius = '.$networkmap['filter']['node_radius'].";\n"; $output .= 'var networkmap_holding_area_dimensions = '.json_encode($networkmap['filter']['holding_area']).";\n"; $output .= "var networkmap = {'nodes': [], 'links': []};\n"; diff --git a/pandora_console/include/javascript/functions_pandora_networkmap.js b/pandora_console/include/javascript/functions_pandora_networkmap.js index e5a0b87f7e..5d3477dca1 100644 --- a/pandora_console/include/javascript/functions_pandora_networkmap.js +++ b/pandora_console/include/javascript/functions_pandora_networkmap.js @@ -14,6 +14,7 @@ /* global holding_area_dimensions */ /* global networkmap_id */ /* global enterprise_installed */ +/* global networkmap_write */ /* global force */ /* global layer_graph_nodes */ /* global layer_graph_links */ @@ -2087,7 +2088,12 @@ function show_menu(item, data) { icon: "add_node", disabled: function() { if (enterprise_installed) { - return false; + // Check if user can write network maps. + if (networkmap_write) { + return false; + } else { + return true; + } } else { return true; } @@ -2099,6 +2105,14 @@ function show_menu(item, data) { items_list["center"] = { name: set_center_menu, icon: "center", + disabled: function() { + // Check if user can write network maps. + if (networkmap_write) { + return false; + } else { + return true; + } + }, callback: function(key, options) { set_center(networkmap_id); } @@ -2136,7 +2150,12 @@ function show_menu(item, data) { icon: "restart_map", disabled: function() { if (enterprise_installed) { - return false; + // Check if user can write network maps. + if (networkmap_write) { + return false; + } else { + return true; + } } else { return true; } From 30caad5a6c2d296cc0ade118bbfa8dc55541dc70 Mon Sep 17 00:00:00 2001 From: Tatiana Llorente Date: Tue, 15 Oct 2019 16:50:05 +0200 Subject: [PATCH 06/16] Added column cache_expiration in tlayout_template_data in MR, migrate, and pandoradb.sql - #4810 --- pandora_console/extras/mr/33.sql | 5 +++++ .../extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 1 + pandora_console/pandoradb.sql | 1 + 3 files changed, 7 insertions(+) create mode 100644 pandora_console/extras/mr/33.sql diff --git a/pandora_console/extras/mr/33.sql b/pandora_console/extras/mr/33.sql new file mode 100644 index 0000000000..31af5570e4 --- /dev/null +++ b/pandora_console/extras/mr/33.sql @@ -0,0 +1,5 @@ +START TRANSACTION; + +ALTER TABLE `tlayout_template_data` ADD COLUMN `cache_expiration` INTEGER UNSIGNED NOT NULL DEFAULT 0; + +COMMIT; diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql index 6476e79e2b..d7e416c951 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 @@ -1907,6 +1907,7 @@ CREATE TABLE IF NOT EXISTS `tlayout_template_data` ( `linked_layout_status_as_service_warning` FLOAT(20, 3) NOT NULL default 0, `linked_layout_status_as_service_critical` FLOAT(20, 3) NOT NULL default 0, `linked_layout_node_id` INT(10) NOT NULL default 0, + `cache_expiration` INTEGER UNSIGNED NOT NULL default 0, PRIMARY KEY(`id`), FOREIGN KEY (`id_layout_template`) REFERENCES tlayout_template(`id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE = InnoDB DEFAULT CHARSET=utf8; diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 3786c4dad3..3b11dccb4d 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -3522,6 +3522,7 @@ CREATE TABLE IF NOT EXISTS `tlayout_template_data` ( `time_format` varchar(60) NOT NULL default "time", `timezone` varchar(60) NOT NULL default "Europe/Madrid", `show_last_value` tinyint(1) UNSIGNED NULL default '0', + `cache_expiration` INTEGER UNSIGNED NOT NULL default 0, PRIMARY KEY(`id`), FOREIGN KEY (`id_layout_template`) REFERENCES tlayout_template(`id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE = InnoDB DEFAULT CHARSET=utf8; From 7c39f3680ecfb74b60a94744b25b7aa3e8d4e705 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Tue, 22 Oct 2019 11:54:27 +0200 Subject: [PATCH 07/16] Added feature sample_agent --- .../FreeBSD/pandora_server.conf.new | 9 ++ pandora_server/NetBSD/pandora_server.conf.new | 9 ++ pandora_server/bin/pandora_server | 8 ++ pandora_server/conf/pandora_server.conf.new | 9 ++ .../conf/pandora_server.conf.windows | 9 ++ pandora_server/lib/PandoraFMS/Config.pm | 14 ++- pandora_server/lib/PandoraFMS/Core.pm | 87 ++++++++++++++++++- 7 files changed, 143 insertions(+), 2 deletions(-) diff --git a/pandora_server/FreeBSD/pandora_server.conf.new b/pandora_server/FreeBSD/pandora_server.conf.new index 93d9abbc75..01ff859fa5 100644 --- a/pandora_server/FreeBSD/pandora_server.conf.new +++ b/pandora_server/FreeBSD/pandora_server.conf.new @@ -348,6 +348,15 @@ self_monitoring 1 # Self monitoring interval (in seconds). self_monitoring_interval 300 +# Pandora Sample Agent. If enabled, every 10 minutes, this embedded agent +# will make sample data. Disabled by default. + +sample_agent 0 + +# Pandora Sample Agent interval (in seconds). + +sample_agent_interval 600 + # Update parent from the agent xml #update_parent 1 diff --git a/pandora_server/NetBSD/pandora_server.conf.new b/pandora_server/NetBSD/pandora_server.conf.new index 5f38a678da..66743aee36 100644 --- a/pandora_server/NetBSD/pandora_server.conf.new +++ b/pandora_server/NetBSD/pandora_server.conf.new @@ -340,6 +340,15 @@ restart_delay 60 self_monitoring 1 +# Pandora Sample Agent. If enabled, every 10 minutes, this embedded agent +# will make sample data. Disabled by default. + +sample_agent 0 + +# Pandora Sample Agent interval (in seconds). + +sample_agent_interval 600 + # Update parent from the agent xml #update_parent 1 diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server index a367eb7bca..d91b523da6 100755 --- a/pandora_server/bin/pandora_server +++ b/pandora_server/bin/pandora_server @@ -382,6 +382,14 @@ sub pandora_server_tasks ($) { pandora_self_monitoring ($pa_config, $dbh); } + # Pandora sample agent + if (defined($pa_config->{"sample_agent"}) + && $pa_config->{"sample_agent"} == 1 + && !is_metaconsole($pa_config) + && $counter % $pa_config->{"sample_agent_interval"} == 0) { + pandora_sample_agent ($pa_config); + } + # Avoid counter overflow if ($counter >= ~0){ $counter = 0; diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new index 3aa61de07f..7722f22962 100644 --- a/pandora_server/conf/pandora_server.conf.new +++ b/pandora_server/conf/pandora_server.conf.new @@ -376,6 +376,15 @@ self_monitoring 1 # Self monitoring interval (in seconds). self_monitoring_interval 300 +# Pandora Sample Agent. If enabled, every 10 minutes, this embedded agent +# will make sample data. Disabled by default. + +sample_agent 0 + +# Pandora Sample Agent interval (in seconds). + +sample_agent_interval 600 + # Update parent from the agent xml #update_parent 1 diff --git a/pandora_server/conf/pandora_server.conf.windows b/pandora_server/conf/pandora_server.conf.windows index c7c5db64b4..a7232e459c 100644 --- a/pandora_server/conf/pandora_server.conf.windows +++ b/pandora_server/conf/pandora_server.conf.windows @@ -330,6 +330,15 @@ restart_delay 60 # Self monitoring interval (in seconds). #self_monitoring_interval 300 +# Pandora Sample Agent. If enabled, every 10 minutes, this embedded agent +# will make sample data. Disabled by default. + +sample_agent 0 + +# Pandora Sample Agent interval (in seconds). + +sample_agent_interval 600 + # Update parent from the agent xml #update_parent 1 diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index bedb8b7e70..7b5d6496c2 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -79,7 +79,7 @@ sub help_screen { sub pandora_init { my $pa_config = $_[0]; my $init_string = $_[1]; - print "\n$init_string $pandora_version Build $pandora_build Copyright (c) 2004-2018 " . pandora_get_initial_copyright_notice() . "\n"; + print "\n$init_string $pandora_version Build $pandora_build Copyright (c) 2004-20".substr($pandora_build,0,2)." " . pandora_get_initial_copyright_notice() . "\n"; print "This program is OpenSource, licensed under the terms of GPL License version 2.\n"; print "You can download latest versions and documentation at official web page.\n\n"; @@ -397,6 +397,12 @@ sub pandora_load_config { # Self monitoring interval $pa_config->{'self_monitoring_interval'} = 300; # 5.1SP1 + # Sample Agent + $pa_config->{'sample_agent'} = 0; + + # Sample agent interval + $pa_config->{'sample_agent_interval'} = 600; + # Process XML data files as a stack $pa_config->{"dataserver_lifo"} = 0; # 5.0 @@ -946,6 +952,12 @@ sub pandora_load_config { elsif ($parametro =~ m/^self_monitoring_interval\s+([0-9]*)/i) { $pa_config->{'self_monitoring_interval'} = clean_blank($1); } + elsif ($parametro =~ m/^sample_agent\s+([0-1])/i) { + $pa_config->{'sample_agent'} = clean_blank($1); + } + elsif ($parametro =~ m/^sample_agent_interval\s+([0-9]*)/i) { + $pa_config->{'sample_agent_interval'} = clean_blank($1); + } elsif ($parametro =~ m/^update_parent\s+([0-1])/i) { $pa_config->{'update_parent'} = clean_blank($1); } diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index ae67d5ca70..280bdb2158 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -100,6 +100,8 @@ Exported Functions: =item * C +=item * C + =back =head1 METHODS @@ -122,6 +124,7 @@ use threads::shared; use JSON qw(decode_json encode_json); use MIME::Base64; use Text::ParseWords; +use Math::Trig; # Math functions # Debugging #use Data::Dumper; @@ -247,6 +250,7 @@ our @EXPORT = qw( pandora_group_statistics pandora_server_statistics pandora_self_monitoring + pandora_sample_agent pandora_process_policy_queue subst_alert_macros subst_column_macros @@ -5114,7 +5118,7 @@ sub pandora_self_monitoring ($$) { my $timezone_offset = 0; # PENDING (TODO) ! my $utimestamp = time (); my $timestamp = strftime ("%Y-%m-%d %H:%M:%S", localtime()); - + logger($pa_config, "Self monitoring activated.", 1); my $xml_output = ""; $xml_output = "{'version'} . "' agent_name='".$pa_config->{'servername'} . "' agent_alias='".$pa_config->{'servername'} . "' interval='".$pa_config->{"self_monitoring_interval"}."' timestamp='".$timestamp."' >"; @@ -5235,6 +5239,87 @@ sub pandora_self_monitoring ($$) { print XMLFILE $xml_output; close (XMLFILE); } +########################################################################## +=head2 C<< xml_module_template (I<$module_name>, I<$module_type>, I<$module_data>) >> + +Module template for sample agent + +=cut +########################################################################## +sub xml_module_template ($$$) { + my ($module_name, $module_type, $module_data) = @_; + my $output = "\n"; + + $module_name = "" if $module_name =~ /[\s+.]+/; + $module_data = "" if $module_data =~ /[\s+.]+/; + + $output .= "\t".$module_name."\n"; + $output .= "\t".$module_type."\n"; + $output .= "\t".$module_data."\n"; + $output .= "\n"; + + return $output; +} +########################################################################## +=head2 C<< pandora_sample_agent (I<$pa_config>) >> + +Pandora agent for make sample data + +=cut +########################################################################## +sub pandora_sample_agent ($) { + + my ($pa_config) = @_; + logger($pa_config, "Sample agent activated.", 1); + my $utimestamp = time (); + my $timestamp = strftime ("%Y-%m-%d %H:%M:%S", localtime()); + + # First line + my $xml_output = "{'version'} . "' agent_name='".$pa_config->{'servername'} . "' agent_alias='".$pa_config->{'servername'} . "' interval='".$pa_config->{"self_monitoring_interval"}."' timestamp='".$timestamp."' >"; + # Boolean_True -> generic_proc siempre a 1 + $xml_output .= xml_module_template ("Siempre a uno", "generic_proc","1"); + # Boolean_MostlyTrue -> generic_proc un 80% de veces a 1 + my $sample_boolean_mostly_true = 1; + $sample_boolean_mostly_true = 0 if rand(9) > 7; + $xml_output .= xml_module_template ("Boolean mostly true", "generic_proc",$sample_boolean_mostly_true); + # Boolean_MostlyFalse -> generic_proc un 80% de veces a 1 + my $sample_boolean_mostly_false = 0; + $sample_boolean_mostly_false = 1 if rand(9) > 7; + $xml_output .= xml_module_template ("Siempre a uno", "generic_proc", $sample_boolean_mostly_false); + # Boolean_False -> generic_proc siempre a 0 + $xml_output .= xml_module_template ("Siempre_false", "generic_proc","0"); + # Data_Series_Scatter -> Valores random de 0 a 100 + $xml_output .= xml_module_template ("Random_integer_values", "generic_data",int(rand(100))); + # Data_Series_Curve -> Valores en curvas senoidales o similares de 0 a 100 + # (utilizar funcion matemática que use timestamp actual, para no tener que + # guardar valores anteriores) + my $b = 1; + my $sample_serie_curve = 1 + cos(deg2rad($b)); + $b = $b + rand(20)/10; + $b = 0 if ($b > 180); + $sample_serie_curve = $sample_serie_curve * $b * 10; + $sample_serie_curve =~ s/\,/\./g; + $xml_output .= xml_module_template ("Random text", "generic_string", $sample_serie_curve); + # Text -> generic_string > Con una cadena de texto aleatorio de + # 10 caracteres, idealmente con espacios y caracteres ascii + # basicos (letras). + # String with 10 random characters + my $sample_random_text = ""; + my @characters = ('a'..'z','A'..'Z'); + for (1...10){ + $sample_random_text .= $characters[int(rand(@characters))]; + } + $xml_output .= xml_module_template ("Random text", "generic_string", $sample_random_text); + # End of xml + $xml_output .= ""; + # File definition + my $filename = $pa_config->{"incomingdir"}."/".$pa_config->{'servername'}.".sample.".$utimestamp.".data"; + # Opening, Writing and closing of XML + open (my $xmlfile, ">", $filename) or die "[FATAL] Could not open sample XML file for deploying monitorization at '$filename'"; + print $xmlfile $xml_output; + close ($xmlfile); + +} ########################################################################## =head2 C<< set_master (I<$pa_config>, I<$dbh>) >> From 305dfa441d77031a73accdd8de5bdd2c7592bbc2 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Tue, 22 Oct 2019 14:03:24 +0200 Subject: [PATCH 08/16] Minor fix applied --- pandora_server/lib/PandoraFMS/Core.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 280bdb2158..7d03d5da07 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -5273,9 +5273,10 @@ sub pandora_sample_agent ($) { logger($pa_config, "Sample agent activated.", 1); my $utimestamp = time (); my $timestamp = strftime ("%Y-%m-%d %H:%M:%S", localtime()); - # First line - my $xml_output = "{'version'} . "' agent_name='".$pa_config->{'servername'} . "' agent_alias='".$pa_config->{'servername'} . "' interval='".$pa_config->{"self_monitoring_interval"}."' timestamp='".$timestamp."' >"; + my $xml_output = "\n"; + # Header + $xml_output = "\n"; # Boolean_True -> generic_proc siempre a 1 $xml_output .= xml_module_template ("Siempre a uno", "generic_proc","1"); # Boolean_MostlyTrue -> generic_proc un 80% de veces a 1 @@ -5312,7 +5313,7 @@ sub pandora_sample_agent ($) { $xml_output .= xml_module_template ("Random text", "generic_string", $sample_random_text); # End of xml $xml_output .= ""; - # File definition + # File path definition my $filename = $pa_config->{"incomingdir"}."/".$pa_config->{'servername'}.".sample.".$utimestamp.".data"; # Opening, Writing and closing of XML open (my $xmlfile, ">", $filename) or die "[FATAL] Could not open sample XML file for deploying monitorization at '$filename'"; From 33d26144f137d75d5f4992d192de72af861445c7 Mon Sep 17 00:00:00 2001 From: Luis Calvo Date: Tue, 22 Oct 2019 16:00:01 +0200 Subject: [PATCH 09/16] Fixed planned downtime acl --- .../general/firts_task/planned_downtime.php | 2 +- .../agentes/planned_downtime.editor.php | 8 +++---- .../godmode/agentes/planned_downtime.list.php | 22 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pandora_console/general/firts_task/planned_downtime.php b/pandora_console/general/firts_task/planned_downtime.php index dcd98fdebb..21bfb4b083 100644 --- a/pandora_console/general/firts_task/planned_downtime.php +++ b/pandora_console/general/firts_task/planned_downtime.php @@ -33,7 +33,7 @@ ui_require_css_file('firts_task'); ); ?>

-
+
diff --git a/pandora_console/godmode/agentes/planned_downtime.editor.php b/pandora_console/godmode/agentes/planned_downtime.editor.php index eef8d5fbdf..ebf64a87c1 100644 --- a/pandora_console/godmode/agentes/planned_downtime.editor.php +++ b/pandora_console/godmode/agentes/planned_downtime.editor.php @@ -827,7 +827,7 @@ $table->data[5][1] = " '; -echo '
'; +echo ''; if ($id_downtime > 0) { echo ''; @@ -929,7 +929,7 @@ if ($id_downtime > 0) { $disabled_add_button = true; } - echo ""; + echo ""; html_print_select_groups(false, $access, true, 'filter_group', $filter_group, '', '', '', false, false, true, '', false, 'min-width:180px;margin-right:15px;'); html_print_checkbox('recursion', 1, $recursion, false, false, ''); @@ -939,7 +939,7 @@ if ($id_downtime > 0) { echo ''; // Show available agents to include into downtime echo '

'.__('Available agents').':

'; - echo ""; + echo ""; echo html_print_select($agents, 'id_agents[]', -1, '', _('Any'), -2, false, true, true, '', false, 'width: 180px;'); @@ -1085,7 +1085,7 @@ if ($id_downtime > 0) { $data[5] = ''.html_print_image('images/config.png', true, ['border' => '0', 'alt' => __('Delete')]).''; } - $data[5] .= ''.html_print_image('images/cross.png', true, ['border' => '0', 'alt' => __('Delete')]).''; + $data[5] .= ''.html_print_image('images/cross.png', true, ['border' => '0', 'alt' => __('Delete')]).''; } $table->data['agent_'.$downtime_agent['id_agente']] = $data; diff --git a/pandora_console/godmode/agentes/planned_downtime.list.php b/pandora_console/godmode/agentes/planned_downtime.list.php index 49a72f125d..01f30afba6 100755 --- a/pandora_console/godmode/agentes/planned_downtime.list.php +++ b/pandora_console/godmode/agentes/planned_downtime.list.php @@ -357,7 +357,7 @@ if (!$downtimes && !$filter_performed) { // No downtimes cause the user performed a search. else if (!$downtimes) { // Filter form. - echo ""; + echo ""; html_print_table($table_form); echo ''; @@ -369,7 +369,7 @@ else if (!$downtimes) { // Create button. if ($write_permisson) { echo ' '; - echo ''; + echo ''; html_print_submit_button(__('Create'), 'create', false, 'class="sub next"'); echo ''; } @@ -378,11 +378,11 @@ else if (!$downtimes) { } // Has downtimes. else { - echo ""; + echo ""; html_print_table($table_form); echo ''; - ui_pagination($downtimes_number, "index.php?sec=estado&sec2=godmode/agentes/planned_downtime.list&$filter_params_str", $offset); + ui_pagination($downtimes_number, "index.php?sec=extensions&sec2=godmode/agentes/planned_downtime.list&$filter_params_str", $offset); // User groups with AR, AD or AW permission. $groupsAD = users_get_groups($config['id_user'], $access); @@ -476,7 +476,7 @@ else { if (in_array($downtime['id_group'], $groupsAD)) { // Stop button if ($downtime['type_execution'] == 'once' && $downtime['executed'] == 1) { - $data['stop'] = ''.html_print_image('images/cancel.png', true, ['title' => __('Stop downtime')]); + $data['stop'] = ''.html_print_image('images/cancel.png', true, ['title' => __('Stop downtime')]); } else { $data['stop'] = ''; } @@ -484,12 +484,12 @@ else { // Edit & delete buttons. if ($downtime['executed'] == 0) { // Edit. - $data['edit'] = ''.html_print_image('images/config.png', true, ['title' => __('Update')]).''; + $data['edit'] = ''.html_print_image('images/config.png', true, ['title' => __('Update')]).''; // Delete. - $data['delete'] = ''.html_print_image('images/cross.png', true, ['title' => __('Delete')]); + $data['delete'] = ''.html_print_image('images/cross.png', true, ['title' => __('Delete')]); } else if ($downtime['executed'] == 1 && $downtime['type_execution'] == 'once') { // Edit. - $data['edit'] = ''.html_print_image('images/config.png', true, ['title' => __('Update')]).''; + $data['edit'] = ''.html_print_image('images/config.png', true, ['title' => __('Update')]).''; // Delete. $data['delete'] = __('N/A'); } else { @@ -515,7 +515,7 @@ else { } html_print_table($table); - ui_pagination($downtimes_number, "index.php?sec=estado&sec2=godmode/agentes/planned_downtime.list&$filter_params_str", $offset, 0, false, 'offset', true, 'pagination-bottom'); + ui_pagination($downtimes_number, "index.php?sec=extensions&sec2=godmode/agentes/planned_downtime.list&$filter_params_str", $offset, 0, false, 'offset', true, 'pagination-bottom'); echo '
'; // CSV export button. @@ -532,7 +532,7 @@ else { // Create button. if ($write_permisson) { echo ' '; - echo '
'; + echo ''; html_print_submit_button(__('Create'), 'create', false, 'class="sub next"'); echo ''; } @@ -559,7 +559,7 @@ $(document).ready (function () { if ( && ) { if (confirm("")) { - window.location.href = "index.php?sec=estado&sec2=godmode/agentes/planned_downtime.list&migrate_malformed=1"; + window.location.href = "index.php?sec=extensions&sec2=godmode/agentes/planned_downtime.list&migrate_malformed=1"; } } }); From a6d1f3a54494513bcdf01829ee676be4d89d825f Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Tue, 22 Oct 2019 16:23:46 +0200 Subject: [PATCH 10/16] Another minor fix applied --- pandora_server/lib/PandoraFMS/Core.pm | 35 ++++++++++++--------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 7d03d5da07..9acefdd326 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -5118,7 +5118,7 @@ sub pandora_self_monitoring ($$) { my $timezone_offset = 0; # PENDING (TODO) ! my $utimestamp = time (); my $timestamp = strftime ("%Y-%m-%d %H:%M:%S", localtime()); - logger($pa_config, "Self monitoring activated.", 1); + my $xml_output = ""; $xml_output = "{'version'} . "' agent_name='".$pa_config->{'servername'} . "' agent_alias='".$pa_config->{'servername'} . "' interval='".$pa_config->{"self_monitoring_interval"}."' timestamp='".$timestamp."' >"; @@ -5270,47 +5270,42 @@ Pandora agent for make sample data sub pandora_sample_agent ($) { my ($pa_config) = @_; - logger($pa_config, "Sample agent activated.", 1); + my $utimestamp = time (); my $timestamp = strftime ("%Y-%m-%d %H:%M:%S", localtime()); # First line my $xml_output = "\n"; # Header - $xml_output = "\n"; - # Boolean_True -> generic_proc siempre a 1 - $xml_output .= xml_module_template ("Siempre a uno", "generic_proc","1"); - # Boolean_MostlyTrue -> generic_proc un 80% de veces a 1 + $xml_output = "\n"; + # Boolean ever return TRUE + $xml_output .= xml_module_template ("Boolean ever true", "generic_proc","1"); + # Boolean return TRUE at 80% of times my $sample_boolean_mostly_true = 1; $sample_boolean_mostly_true = 0 if rand(9) > 7; $xml_output .= xml_module_template ("Boolean mostly true", "generic_proc",$sample_boolean_mostly_true); - # Boolean_MostlyFalse -> generic_proc un 80% de veces a 1 + # Boolean return false at 80% of times my $sample_boolean_mostly_false = 0; $sample_boolean_mostly_false = 1 if rand(9) > 7; - $xml_output .= xml_module_template ("Siempre a uno", "generic_proc", $sample_boolean_mostly_false); - # Boolean_False -> generic_proc siempre a 0 - $xml_output .= xml_module_template ("Siempre_false", "generic_proc","0"); - # Data_Series_Scatter -> Valores random de 0 a 100 - $xml_output .= xml_module_template ("Random_integer_values", "generic_data",int(rand(100))); - # Data_Series_Curve -> Valores en curvas senoidales o similares de 0 a 100 - # (utilizar funcion matemática que use timestamp actual, para no tener que - # guardar valores anteriores) + $xml_output .= xml_module_template ("Boolean mostly false", "generic_proc", $sample_boolean_mostly_false); + # Boolean ever return FALSE + $xml_output .= xml_module_template ("Boolean ever false", "generic_proc","0"); + # Random integer between 0 and 100 + $xml_output .= xml_module_template ("Random integer values", "generic_data",int(rand(100))); + # Random values obtained with sinusoidal curves between 0 and 100 values my $b = 1; my $sample_serie_curve = 1 + cos(deg2rad($b)); $b = $b + rand(20)/10; $b = 0 if ($b > 180); $sample_serie_curve = $sample_serie_curve * $b * 10; $sample_serie_curve =~ s/\,/\./g; - $xml_output .= xml_module_template ("Random text", "generic_string", $sample_serie_curve); - # Text -> generic_string > Con una cadena de texto aleatorio de - # 10 caracteres, idealmente con espacios y caracteres ascii - # basicos (letras). + $xml_output .= xml_module_template ("Random serie curve", "generic_data", $sample_serie_curve); # String with 10 random characters my $sample_random_text = ""; my @characters = ('a'..'z','A'..'Z'); for (1...10){ $sample_random_text .= $characters[int(rand(@characters))]; } - $xml_output .= xml_module_template ("Random text", "generic_string", $sample_random_text); + $xml_output .= xml_module_template ("Random text", "generic_data_string", $sample_random_text); # End of xml $xml_output .= ""; # File path definition From 29bcd379f7cb2a7c72adbf861db0acb15f8f302a Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Thu, 24 Oct 2019 11:53:35 +0200 Subject: [PATCH 11/16] Added changes for liking with visual consoles --- pandora_console/extensions/sample_agent.php | 73 +++++++++++++++++++++ pandora_console/pandoradb_data.sql | 59 +++++++++-------- pandora_server/bin/pandora_server | 5 +- 3 files changed, 108 insertions(+), 29 deletions(-) create mode 100644 pandora_console/extensions/sample_agent.php diff --git a/pandora_console/extensions/sample_agent.php b/pandora_console/extensions/sample_agent.php new file mode 100644 index 0000000000..3da4a61090 --- /dev/null +++ b/pandora_console/extensions/sample_agent.php @@ -0,0 +1,73 @@ + '$id_agente'], 'id_agente_modulo'); + $count_modules = count($modules); + + // Update of layout 1 (Rack sample). + $images_rack_server = [ + 'rack_server_rack', + 'rack_server', + 'rack_switch', + 'rack_firewall', + 'rack_double_server', + 'rack_frame', + 'rack_pdu', + ]; + $query = 'UPDATE `tlayout_data` SET `id_agent` = '.$id_agente.', `id_agente_modulo` = CASE `image` '; + for ($i = 0; $i < $count_modules; $i++) { + $query .= 'WHEN "'.$images_rack_server[$i].'" THEN '.$modules[$i].' '; + } + + $query .= 'END '; + $query .= 'WHERE `id_layout` = 1 AND `image` IN ("'.implode('","', $images_rack_server).'");'; + db_process_sql($query); + // Update of layout 2 (Dashboard). + $query = 'UPDATE `tlayout_data` SET `id_agent`= '.$id_agente.', CASE '; + $query .= 'WHEN `id` = 99 THEN '.$modules[0].' '; + $query .= 'WHEN `id` = 100 THEN '.$modules[1].' '; + $query .= 'WHEN `id` = 101 THEN '.$modules[2].' '; + $query .= 'WHEN `id` = 102 THEN '.$modules[3].' '; + $query .= 'WHEN `id` = 103 THEN '.$modules[4].' '; + $query .= 'WHEN `id` = 112 THEN '.$modules[5].' '; + $query .= 'WHEN `id` = 113 THEN '.$modules[6].' '; + $query .= 'WHEN `id` = 114 THEN '.$modules[7].' '; + $query .= 'END '; + $query .= 'WHERE `id_layout` = 2 AND `id` IN (99,100,101,102,103,112,113,114);'; + db_process_sql($query); + + // This setting will avoid regenerate all the times the visual consoles. + $values = [ + 'token' => 'sample_agent_deployed', + 'value' => '1', + ]; + db_process_sql_insert('tconfig', $values); + } +} + + +extensions_add_main_function('sample_agent_deployment'); diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 686f4aa487..b6cf713563 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -138,7 +138,8 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('cr_incident_type', ''), ('cr_incident_status', ''), ('cr_incident_title', ''), -('cr_incident_content', ''); +('cr_incident_content', ''), +('sample_agent', '0'); UNLOCK TABLES; -- @@ -1402,41 +1403,41 @@ VALUES (53,1,1413,243,205,426,'','rack_frame',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (54,1,962,381,73,408,'','rack_firewall',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (55,1,962,454,73,408,'','rack_pdu',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (56,1,530,732,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (57,1,962,233,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (58,1,962,307,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (59,1,530,658,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (60,1,530,350,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (61,1,530,204,73,408,'','rack_psa',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (62,1,530,277,73,408,'','rack_pdu',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (63,1,530,585,73,408,'','rack_firewall',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (64,1,530,424,161,411,'','rack_double_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), + (56,1,530,732,74,413,'','rack_server',0,3600,51,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (57,1,962,233,74,413,'','rack_server',0,3600,54,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (58,1,962,307,74,413,'','rack_server',0,3600,55,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (59,1,530,658,74,413,'','rack_server',0,3600,50,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (60,1,530,350,74,413,'','rack_server',0,3600,51,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (61,1,530,204,73,408,'','rack_psa',0,3600,52,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (62,1,530,277,73,408,'','rack_pdu',0,3600,51,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (63,1,530,585,73,408,'','rack_firewall',0,3600,52,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (64,1,530,424,161,411,'','rack_double_server',0,3600,51,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), (65,1,1426,448,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (66,1,1495,540,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (67,1,1423,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (68,1,1463,540,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (69,1,1433,540,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (70,1,74,733,73,408,'','rack_pdu',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), + (70,1,74,733,73,408,'','rack_pdu',0,3600,52,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), (71,1,1098,701,80,18,'','rack_hard_disk',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (72,1,1148,701,80,18,'','rack_hard_disk',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (73,1,1340,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (74,1,1358,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (75,1,1358,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (76,1,1143,783,80,18,'','rack_hard_disk',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (77,1,962,682,205,426,'','rack_frame',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), + (77,1,962,682,205,426,'','rack_frame',0,3600,50,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), (78,1,1522,540,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (79,1,1419,521,205,426,'','rack_frame',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (80,1,74,278,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (81,1,74,572,161,411,'','rack_double_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), + (79,1,1420,521,205,426,'','rack_frame',0,3600,53,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (80,1,74,278,74,413,'','rack_server',0,3600,51,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (81,1,74,572,161,411,'','rack_double_server',0,3600,51,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), (82,1,1418,729,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (83,1,962,527,73,408,'','rack_switch',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (84,1,74,352,73,408,'','rack_router',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (85,1,962,600,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (86,1,530,806,73,408,'','rack_firewall',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (87,1,74,425,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), + (86,1,530,806,73,408,'','rack_firewall',0,3600,52,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (87,1,74,425,74,413,'','rack_server',0,3600,51,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), (88,1,74,499,73,408,'','rack_switch',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (89,1,74,806,73,408,'','rack_psa',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (90,1,74,204,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), + (89,1,74,806,73,408,'','rack_psa',0,3600,52,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (90,1,74,204,74,413,'','rack_server',0,3600,51,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), (91,1,1424,806,73,408,'','rack_firewall',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (92,1,1486,907,0,0,'<p style="text-align: center; overflow: hidden;"><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;"><strong><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Office 8 -&nbsp;</span></strong></span><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Rack 2</span></p>','white',4,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,0), (93,1,1048,889,58,281,'<p style="text-align: center; overflow: hidden;"><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;"><strong><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Office 8 -&nbsp;</span></strong></span><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Rack 1</span></p>','white',4,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,0), @@ -1445,18 +1446,20 @@ VALUES (96,1,733,20,0,0,'<p style="overflow: hidden;"><span class="visual_font_size_48pt"><strong><span style="color: #ffffff; font-family: opensans;">OFFICE RACKS</span></strong></span></p>','white',4,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,0), (97,1,1479,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (98,2,709,103,0,400,'','white',19,3600,0,0,0,0,1,0,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','timedate','Europe/Madrid',0,0), - (99,2,178,481,111,111,'','status',0,3600,11556,430,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), - (100,2,542,481,111,111,'','status',0,3600,13,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), - (101,2,905,481,111,111,'','status',0,3600,114,11,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), - (102,2,1276,481,111,111,'','status',0,3600,7,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), + (99,2,178,481,111,111,'','status',0,3600,50,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (100,2,542,481,111,111,'','status',0,3600,51,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (101,2,905,481,111,111,'','status',0,3600,52,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (102,2,1276,481,111,111,'','status',0,3600,53,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), (103,2,1631,482,111,111,'','status',0,3600,11547,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), - (104,2,157,393,0,0,'

Backups

\n

 

','white', -4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), - (105,2,512,382,96,172,'<p style="overflow: hidden;"><span class="visual_font_size_28pt" style="font-family: opensans; color: #ffffff;">DB Status</span></p> <p style="overflow: hidden;">&nbsp;</p>','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), + (104,2,157,393,0,0,'

Backups

\n

 

','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), + (105,2,512,382,96,172,'<p style="overflow: hidden;"><span class="visual_font_size_28pt" style="font-family: opensans; color: #ffffff;">DB Status</span></p> <p style="overflow: hidden;">&nbsp;</p>','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), (106,2,886,382,0,0,'

Disk slave

\n

 

','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), (107,2,1251,382,0,0,'

Disk /var

\n

 

','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), - (108,2,1547,382,0,0,'<p style="line-height: 18px; overflow: hidden;"><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Authentification</span></p>','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), + (108,2,1547,382,0,0,'<p style="line-height: 18px; overflow: hidden;"><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Authentification</span></p>','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), (109,2,126,820,0,0,'<p style="line-height: 18px; overflow: hidden;"><strong><span class="visual_font_size_36pt" style="font-family: opensans; color: #ffffff;">Processing</span></strong></p>','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), (110,2,755,820,0,0,'<p style="line-height: 18px; overflow: hidden;"><strong><span class="visual_font_size_36pt" style="font-family: opensans; color: #ffffff;">Network</span></strong></p>','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), - (111,2,1281,820,0,0,'<p style="line-height: 18px; overflow: hidden;"><strong><span class="visual_font_size_36pt" style="color: #ffffff; font-family: opensans;">Storage</span></strong></p>','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0) + (111,2,1281,820,0,0,'<p style="line-height: 18px; overflow: hidden;"><strong><span class="visual_font_size_36pt" style="color: #ffffff; font-family: opensans;">Storage</span></strong></p>','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), + (112,2,387,825,100,226,'<p style="line-height: 26px;"><span class="visual_font_size_60pt"><strong><span style="line-height: 26px; font-family: roboto; color: #ffff99;">(_VALUE_)</span></strong></span></p>','',2,300,54,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (113,2,936,799,0,226,'<p style="line-height: 18px; overflow: hidden;"><strong><span class="visual_font_size_60pt" style="font-family: roboto; color: #ccffcc;">(_VALUE_)</span></strong></p>','',2,300,55,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (114,2,1476,818,0,226,'<p style="line-height: 18px; overflow: hidden;"><span class="visual_font_size_36pt" style="color: #ccffff; font-family: roboto;">(_VALUE_)</span></p> <div id="gtx-trans" style="position: absolute; left: 43px; top: 4.65625px;">&nbsp;</div>','',2,300,56,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0) ; diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server index d91b523da6..7cf34ff112 100755 --- a/pandora_server/bin/pandora_server +++ b/pandora_server/bin/pandora_server @@ -387,7 +387,10 @@ sub pandora_server_tasks ($) { && $pa_config->{"sample_agent"} == 1 && !is_metaconsole($pa_config) && $counter % $pa_config->{"sample_agent_interval"} == 0) { - pandora_sample_agent ($pa_config); + pandora_update_config_token ($dbh, 'sample_agent', 1); + pandora_sample_agent ($pa_config); + } else { + pandora_update_config_token ($dbh, 'sample_agent', 0); } # Avoid counter overflow From 742329336e4c8a750db61c5b4a0c8946732b5751 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Thu, 24 Oct 2019 14:30:34 +0200 Subject: [PATCH 12/16] Added link with visual consoles --- pandora_console/extensions/sample_agent.php | 99 ++++++++++----------- pandora_server/bin/pandora_server | 11 ++- 2 files changed, 53 insertions(+), 57 deletions(-) diff --git a/pandora_console/extensions/sample_agent.php b/pandora_console/extensions/sample_agent.php index 3da4a61090..5657ae2b0e 100644 --- a/pandora_console/extensions/sample_agent.php +++ b/pandora_console/extensions/sample_agent.php @@ -11,63 +11,60 @@ // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. - - -/** +require_once __DIR__.'/../include/config.php'; +require_once __DIR__.'/../include/auth/mysql.php'; +require_once __DIR__.'/../include/functions.php'; +require_once __DIR__.'/../include/functions_db.php'; +/* * Review if sample agent is active and deploys configuration for * visual consoles if necessary - * - * @return void */ -function sample_agent_deployment() -{ - global $config; - // Deployment of sample agent for visual consoles. - if ($config['sample_agent'] == 1 && !isset($config['sample_agent_deployed'])) { - $id_agente = db_get_value_filter('tagente', 'nombre', 'Sample_Agent'); - $modules = db_get_all_rows_filter('tagente_modulo', ['id_agente' => '$id_agente'], 'id_agente_modulo'); - $count_modules = count($modules); +global $config; - // Update of layout 1 (Rack sample). - $images_rack_server = [ - 'rack_server_rack', - 'rack_server', - 'rack_switch', - 'rack_firewall', - 'rack_double_server', - 'rack_frame', - 'rack_pdu', - ]; - $query = 'UPDATE `tlayout_data` SET `id_agent` = '.$id_agente.', `id_agente_modulo` = CASE `image` '; - for ($i = 0; $i < $count_modules; $i++) { - $query .= 'WHEN "'.$images_rack_server[$i].'" THEN '.$modules[$i].' '; - } +// Deployment of sample agent for visual consoles. +if ($config['sample_agent'] == 1 && !isset($config['sample_agent_deployed'])) { + $id_agente = db_get_sql('SELECT id_agente FROM tagente WHERE nombre = "Sample_Agent";'); + $modules = db_get_all_rows_filter('tagente_modulo', ['id_agente' => $id_agente], 'id_agente_modulo'); + $count_modules = count($modules); - $query .= 'END '; - $query .= 'WHERE `id_layout` = 1 AND `image` IN ("'.implode('","', $images_rack_server).'");'; - db_process_sql($query); - // Update of layout 2 (Dashboard). - $query = 'UPDATE `tlayout_data` SET `id_agent`= '.$id_agente.', CASE '; - $query .= 'WHEN `id` = 99 THEN '.$modules[0].' '; - $query .= 'WHEN `id` = 100 THEN '.$modules[1].' '; - $query .= 'WHEN `id` = 101 THEN '.$modules[2].' '; - $query .= 'WHEN `id` = 102 THEN '.$modules[3].' '; - $query .= 'WHEN `id` = 103 THEN '.$modules[4].' '; - $query .= 'WHEN `id` = 112 THEN '.$modules[5].' '; - $query .= 'WHEN `id` = 113 THEN '.$modules[6].' '; - $query .= 'WHEN `id` = 114 THEN '.$modules[7].' '; - $query .= 'END '; - $query .= 'WHERE `id_layout` = 2 AND `id` IN (99,100,101,102,103,112,113,114);'; - db_process_sql($query); - - // This setting will avoid regenerate all the times the visual consoles. - $values = [ - 'token' => 'sample_agent_deployed', - 'value' => '1', - ]; - db_process_sql_insert('tconfig', $values); + // Update of layout 1 (Rack sample). + $images_rack_server = [ + 'rack_server_rack', + 'rack_server', + 'rack_switch', + 'rack_firewall', + 'rack_double_server', + 'rack_frame', + 'rack_pdu', + ]; + $query = 'UPDATE `tlayout_data` SET `id_agent` = '.$id_agente.', `id_agente_modulo` = CASE '; + for ($i = 0; $i < $count_modules; $i++) { + $query .= 'WHEN `image` = "'.$images_rack_server[$i].'" THEN '.$modules[$i]['id_agente_modulo'].' '; } + + $query .= 'END WHERE `id_layout` = 1 AND `image` IN ("'.implode('","', $images_rack_server).'");'; + + db_process_sql($query); + // Update of layout 2 (Dashboard). + $query = 'UPDATE `tlayout_data` SET `id_agent`= '.$id_agente.', `id_agente_modulo` = CASE '; + $query .= 'WHEN `id` = 99 THEN '.$modules[0]['id_agente_modulo'].' '; + $query .= 'WHEN `id` = 100 THEN '.$modules[1]['id_agente_modulo'].' '; + $query .= 'WHEN `id` = 101 THEN '.$modules[2]['id_agente_modulo'].' '; + $query .= 'WHEN `id` = 102 THEN '.$modules[2]['id_agente_modulo'].' '; + $query .= 'WHEN `id` = 103 THEN '.$modules[3]['id_agente_modulo'].' '; + $query .= 'WHEN `id` = 112 THEN '.$modules[4]['id_agente_modulo'].' '; + $query .= 'WHEN `id` = 113 THEN '.$modules[5]['id_agente_modulo'].' '; + $query .= 'WHEN `id` = 114 THEN '.$modules[6]['id_agente_modulo'].' '; + $query .= 'END WHERE `id_layout` = 2 AND `id` IN (99,100,101,102,103,112,113,114);'; + + db_process_sql($query); + + // This setting will avoid regenerate all the times the visual consoles. + $values = [ + 'token' => 'sample_agent_deployed', + 'value' => '1', + ]; + db_process_sql_insert('tconfig', $values); } - extensions_add_main_function('sample_agent_deployment'); diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server index 7cf34ff112..1ce3e3da5e 100755 --- a/pandora_server/bin/pandora_server +++ b/pandora_server/bin/pandora_server @@ -383,14 +383,13 @@ sub pandora_server_tasks ($) { } # Pandora sample agent - if (defined($pa_config->{"sample_agent"}) - && $pa_config->{"sample_agent"} == 1 + if (defined($pa_config->{'sample_agent'})) { + if ($pa_config->{'sample_agent'} == 1 && !is_metaconsole($pa_config) - && $counter % $pa_config->{"sample_agent_interval"} == 0) { - pandora_update_config_token ($dbh, 'sample_agent', 1); + && $counter % $pa_config->{'sample_agent_interval'} == 0){ pandora_sample_agent ($pa_config); - } else { - pandora_update_config_token ($dbh, 'sample_agent', 0); + } + pandora_update_config_token ($dbh, 'sample_agent', $pa_config->{'sample_agent'}); } # Avoid counter overflow From b0db7c729d72dfe30ec8de58ccfa55bb947fcd22 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Thu, 24 Oct 2019 16:23:58 +0200 Subject: [PATCH 13/16] Solved minor issues --- pandora_console/extensions/sample_agent.php | 12 ++-- pandora_console/pandoradb_data.sql | 62 ++++++++++----------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/pandora_console/extensions/sample_agent.php b/pandora_console/extensions/sample_agent.php index 5657ae2b0e..6419980ba6 100644 --- a/pandora_console/extensions/sample_agent.php +++ b/pandora_console/extensions/sample_agent.php @@ -47,15 +47,15 @@ if ($config['sample_agent'] == 1 && !isset($config['sample_agent_deployed'])) { db_process_sql($query); // Update of layout 2 (Dashboard). $query = 'UPDATE `tlayout_data` SET `id_agent`= '.$id_agente.', `id_agente_modulo` = CASE '; - $query .= 'WHEN `id` = 99 THEN '.$modules[0]['id_agente_modulo'].' '; - $query .= 'WHEN `id` = 100 THEN '.$modules[1]['id_agente_modulo'].' '; - $query .= 'WHEN `id` = 101 THEN '.$modules[2]['id_agente_modulo'].' '; - $query .= 'WHEN `id` = 102 THEN '.$modules[2]['id_agente_modulo'].' '; - $query .= 'WHEN `id` = 103 THEN '.$modules[3]['id_agente_modulo'].' '; + $query .= 'WHEN `id` = 107 THEN '.$modules[0]['id_agente_modulo'].' '; + $query .= 'WHEN `id` = 108 THEN '.$modules[1]['id_agente_modulo'].' '; + $query .= 'WHEN `id` = 109 THEN '.$modules[2]['id_agente_modulo'].' '; + $query .= 'WHEN `id` = 110 THEN '.$modules[2]['id_agente_modulo'].' '; + $query .= 'WHEN `id` = 111 THEN '.$modules[3]['id_agente_modulo'].' '; $query .= 'WHEN `id` = 112 THEN '.$modules[4]['id_agente_modulo'].' '; $query .= 'WHEN `id` = 113 THEN '.$modules[5]['id_agente_modulo'].' '; $query .= 'WHEN `id` = 114 THEN '.$modules[6]['id_agente_modulo'].' '; - $query .= 'END WHERE `id_layout` = 2 AND `id` IN (99,100,101,102,103,112,113,114);'; + $query .= 'END WHERE `id_layout` = 2 AND `id` IN (107,108,109,110,111,112,113,114);'; db_process_sql($query); diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index b6cf713563..a8365d6684 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -1403,41 +1403,41 @@ VALUES (53,1,1413,243,205,426,'','rack_frame',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (54,1,962,381,73,408,'','rack_firewall',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (55,1,962,454,73,408,'','rack_pdu',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (56,1,530,732,74,413,'','rack_server',0,3600,51,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), - (57,1,962,233,74,413,'','rack_server',0,3600,54,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), - (58,1,962,307,74,413,'','rack_server',0,3600,55,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), - (59,1,530,658,74,413,'','rack_server',0,3600,50,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), - (60,1,530,350,74,413,'','rack_server',0,3600,51,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), - (61,1,530,204,73,408,'','rack_psa',0,3600,52,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), - (62,1,530,277,73,408,'','rack_pdu',0,3600,51,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), - (63,1,530,585,73,408,'','rack_firewall',0,3600,52,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), - (64,1,530,424,161,411,'','rack_double_server',0,3600,51,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (56,1,530,732,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (57,1,962,233,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (58,1,962,307,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (59,1,530,658,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (60,1,530,350,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (61,1,530,204,73,408,'','rack_psa',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (62,1,530,277,73,408,'','rack_pdu',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (63,1,530,585,73,408,'','rack_firewall',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (64,1,530,424,161,411,'','rack_double_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), (65,1,1426,448,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (66,1,1495,540,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (67,1,1423,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (68,1,1463,540,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (69,1,1433,540,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (70,1,74,733,73,408,'','rack_pdu',0,3600,52,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (70,1,74,733,73,408,'','rack_pdu',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), (71,1,1098,701,80,18,'','rack_hard_disk',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (72,1,1148,701,80,18,'','rack_hard_disk',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (73,1,1340,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (74,1,1358,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (75,1,1358,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (76,1,1143,783,80,18,'','rack_hard_disk',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (77,1,962,682,205,426,'','rack_frame',0,3600,50,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (77,1,962,682,205,426,'','rack_frame',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), (78,1,1522,540,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (79,1,1420,521,205,426,'','rack_frame',0,3600,53,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), - (80,1,74,278,74,413,'','rack_server',0,3600,51,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), - (81,1,74,572,161,411,'','rack_double_server',0,3600,51,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (79,1,1420,521,205,426,'','rack_frame',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (80,1,74,278,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (81,1,74,572,161,411,'','rack_double_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), (82,1,1418,729,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (83,1,962,527,73,408,'','rack_switch',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (84,1,74,352,73,408,'','rack_router',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (85,1,962,600,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (86,1,530,806,73,408,'','rack_firewall',0,3600,52,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), - (87,1,74,425,74,413,'','rack_server',0,3600,51,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (86,1,530,806,73,408,'','rack_firewall',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (87,1,74,425,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), (88,1,74,499,73,408,'','rack_switch',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), - (89,1,74,806,73,408,'','rack_psa',0,3600,52,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), - (90,1,74,204,74,413,'','rack_server',0,3600,51,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (89,1,74,806,73,408,'','rack_psa',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (90,1,74,204,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), (91,1,1424,806,73,408,'','rack_firewall',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (92,1,1486,907,0,0,'<p style="text-align: center; overflow: hidden;"><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;"><strong><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Office 8 -&nbsp;</span></strong></span><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Rack 2</span></p>','white',4,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,0), (93,1,1048,889,58,281,'<p style="text-align: center; overflow: hidden;"><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;"><strong><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Office 8 -&nbsp;</span></strong></span><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Rack 1</span></p>','white',4,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,0), @@ -1446,20 +1446,20 @@ VALUES (96,1,733,20,0,0,'<p style="overflow: hidden;"><span class="visual_font_size_48pt"><strong><span style="color: #ffffff; font-family: opensans;">OFFICE RACKS</span></strong></span></p>','white',4,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,0), (97,1,1479,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60), (98,2,709,103,0,400,'','white',19,3600,0,0,0,0,1,0,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','timedate','Europe/Madrid',0,0), - (99,2,178,481,111,111,'','status',0,3600,50,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), - (100,2,542,481,111,111,'','status',0,3600,51,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), - (101,2,905,481,111,111,'','status',0,3600,52,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), - (102,2,1276,481,111,111,'','status',0,3600,53,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), - (103,2,1631,482,111,111,'','status',0,3600,11547,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), + (99,2,1251,382,0,0,'

Disk /var

\n

 

','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), + (100,2,1547,382,0,0,'<p style="line-height: 18px; overflow: hidden;"><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Authentification</span></p>','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), + (101,2,126,820,0,0,'<p style="line-height: 18px; overflow: hidden;"><strong><span class="visual_font_size_36pt" style="font-family: opensans; color: #ffffff;">Processing</span></strong></p>','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), + (102,2,755,820,0,0,'<p style="line-height: 18px; overflow: hidden;"><strong><span class="visual_font_size_36pt" style="font-family: opensans; color: #ffffff;">Network</span></strong></p>','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), + (103,2,1281,820,0,0,'<p style="line-height: 18px; overflow: hidden;"><strong><span class="visual_font_size_36pt" style="color: #ffffff; font-family: opensans;">Storage</span></strong></p>','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), (104,2,157,393,0,0,'

Backups

\n

 

','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), (105,2,512,382,96,172,'<p style="overflow: hidden;"><span class="visual_font_size_28pt" style="font-family: opensans; color: #ffffff;">DB Status</span></p> <p style="overflow: hidden;">&nbsp;</p>','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), (106,2,886,382,0,0,'

Disk slave

\n

 

','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), - (107,2,1251,382,0,0,'

Disk /var

\n

 

','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), - (108,2,1547,382,0,0,'<p style="line-height: 18px; overflow: hidden;"><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Authentification</span></p>','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), - (109,2,126,820,0,0,'<p style="line-height: 18px; overflow: hidden;"><strong><span class="visual_font_size_36pt" style="font-family: opensans; color: #ffffff;">Processing</span></strong></p>','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), - (110,2,755,820,0,0,'<p style="line-height: 18px; overflow: hidden;"><strong><span class="visual_font_size_36pt" style="font-family: opensans; color: #ffffff;">Network</span></strong></p>','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), - (111,2,1281,820,0,0,'<p style="line-height: 18px; overflow: hidden;"><strong><span class="visual_font_size_36pt" style="color: #ffffff; font-family: opensans;">Storage</span></strong></p>','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), - (112,2,387,825,100,226,'<p style="line-height: 26px;"><span class="visual_font_size_60pt"><strong><span style="line-height: 26px; font-family: roboto; color: #ffff99;">(_VALUE_)</span></strong></span></p>','',2,300,54,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), - (113,2,936,799,0,226,'<p style="line-height: 18px; overflow: hidden;"><strong><span class="visual_font_size_60pt" style="font-family: roboto; color: #ccffcc;">(_VALUE_)</span></strong></p>','',2,300,55,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), - (114,2,1476,818,0,226,'<p style="line-height: 18px; overflow: hidden;"><span class="visual_font_size_36pt" style="color: #ccffff; font-family: roboto;">(_VALUE_)</span></p> <div id="gtx-trans" style="position: absolute; left: 43px; top: 4.65625px;">&nbsp;</div>','',2,300,56,4,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0) + (107,2,178,481,111,111,'','status',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (108,2,542,481,111,111,'','status',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (109,2,905,481,111,111,'','status',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (110,2,1276,481,111,111,'','status',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (111,2,1631,482,111,111,'','status',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), + (112,2,387,825,100,226,'<p style="line-height: 26px;"><span class="visual_font_size_60pt"><strong><span style="line-height: 26px; font-family: roboto; color: #ffff99;">(_VALUE_)</span></strong></span></p>','',2,300,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (113,2,936,799,0,226,'<p style="line-height: 18px; overflow: hidden;"><strong><span class="visual_font_size_60pt" style="font-family: roboto; color: #ccffcc;">(_VALUE_)</span></strong></p>','',2,300,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0), + (114,2,1476,818,0,226,'<p style="line-height: 18px; overflow: hidden;"><span class="visual_font_size_36pt" style="color: #ccffff; font-family: roboto;">(_VALUE_)</span></p> <div id="gtx-trans" style="position: absolute; left: 43px; top: 4.65625px;">&nbsp;</div>','',2,300,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0,0,0,0,'analogic_1','time','Europe/Madrid',0,0) ; From c4c7d916e76bbc1f8f9c72a8aaba6843dc0579d6 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Thu, 24 Oct 2019 17:21:21 +0200 Subject: [PATCH 14/16] Applying of better way for save config --- pandora_console/extensions/sample_agent.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pandora_console/extensions/sample_agent.php b/pandora_console/extensions/sample_agent.php index 6419980ba6..ba92debae9 100644 --- a/pandora_console/extensions/sample_agent.php +++ b/pandora_console/extensions/sample_agent.php @@ -60,11 +60,7 @@ if ($config['sample_agent'] == 1 && !isset($config['sample_agent_deployed'])) { db_process_sql($query); // This setting will avoid regenerate all the times the visual consoles. - $values = [ - 'token' => 'sample_agent_deployed', - 'value' => '1', - ]; - db_process_sql_insert('tconfig', $values); + config_update_value('sample_agent_deployed', 1); } extensions_add_main_function('sample_agent_deployment'); From 6f3e42e732e60efc431ababbd1abf494c5c245d8 Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 29 Oct 2019 00:01:13 +0100 Subject: [PATCH 15/16] 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 3ef505359c..ce165fde19 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.740 +Version: 7.0NG.740-191029 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 9af189b481..a4a8dce448 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.740" +pandora_version="7.0NG.740-191029" 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 3aa3d9c388..4bbac522b1 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -42,7 +42,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.740'; -use constant AGENT_BUILD => '191028'; +use constant AGENT_BUILD => '191029'; # 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 dc23e90e2d..79f2310c11 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.740 -%define release 1 +%define release 191029 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 cf4330bba0..392fa174ce 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.740 -%define release 1 +%define release 191029 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 05570423aa..cc4b78b51c 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.740" -PI_BUILD="191028" +PI_BUILD="191029" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 8e5e36a97d..730edbe5de 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{191028} +{191029} 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 7a7ab195eb..823b486b0e 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.740(Build 191028)") +#define PANDORA_VERSION ("7.0NG.740(Build 191029)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index e76449bf45..d714543482 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.740(Build 191028))" + VALUE "ProductVersion", "(7.0NG.740(Build 191029))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index c932f3baa0..cab514f37e 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.740 +Version: 7.0NG.740-191029 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 3b439db8c6..64140d02ad 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.740" +pandora_version="7.0NG.740-191029" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 9c1bd16952..484f8dd138 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 = 'PC191028'; +$build_version = 'PC191029'; $pandora_version = 'v7.0NG.740'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 130c31a047..4f668fcd81 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 5d9aa0c75c..805efb4c41 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.740 -%define release 1 +%define release 191029 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 80e9f80d29..e2eb323b24 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.740 -%define release 1 +%define release 191029 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 6f524cc715..6b1870fadf 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.740" -PI_BUILD="191028" +PI_BUILD="191029" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 4017ec63bf..a9cc09579b 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -34,7 +34,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.740 PS191028"; +my $version = "7.0NG.740 PS191029"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index cfaa9d8f41..3b72f91063 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.740 PS191028"; +my $version = "7.0NG.740 PS191029"; # save program name for logging my $progname = basename($0); From c83b85c225088a62d89974bf6440c76b09912b85 Mon Sep 17 00:00:00 2001 From: Tatiana Llorente Date: Mon, 4 Nov 2019 18:41:03 +0100 Subject: [PATCH 16/16] Ent 4801 error informes pdf csv --- .../extensions/resource_exportation.php | 13 -- .../extensions/resource_registration.php | 13 -- .../reporting_builder.item_editor.php | 94 ------------- .../godmode/reporting/reporting_builder.php | 10 -- .../include/functions_reporting.php | 127 ++---------------- .../include/functions_reporting_html.php | 42 ------ pandora_console/include/functions_reports.php | 18 --- 7 files changed, 11 insertions(+), 306 deletions(-) diff --git a/pandora_console/extensions/resource_exportation.php b/pandora_console/extensions/resource_exportation.php index ddfa9866ad..14384aaec3 100755 --- a/pandora_console/extensions/resource_exportation.php +++ b/pandora_console/extensions/resource_exportation.php @@ -238,19 +238,6 @@ function output_xml_report($id) echo ''; echo ''; break; - - /* - case 'TTRT': - break; - - case 'TTO': - break; - - case 'MTBF': - break; - - case 'MTTR': - break;*/ } echo "\n"; diff --git a/pandora_console/extensions/resource_registration.php b/pandora_console/extensions/resource_registration.php index ea9a5f50e8..dae61e3a78 100755 --- a/pandora_console/extensions/resource_registration.php +++ b/pandora_console/extensions/resource_registration.php @@ -375,19 +375,6 @@ function process_upload_xml_report($xml, $group_filter=0) $values['line_separator'] = io_safe_input($item['line_separator']); $values['column_separator'] = io_safe_input($item['column_separator']); break; - - /* - case 'TTRT': - break; - - case 'TTO': - break; - - case 'MTBF': - break; - - case 'MTTR': - break;*/ } if (empty($agents_item)) { diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index b59dbc2ee5..e7201ab155 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -482,51 +482,6 @@ switch ($action) { $period = $item['period']; break; - /* - case 'TTRT': - $description = $item['description']; - $idAgentModule = $item['id_agent_module']; - $idAgent = db_get_value_filter( - 'id_agente', - 'tagente_modulo', - ['id_agente_modulo' => $idAgentModule] - ); - $period = $item['period']; - break; - - case 'TTO': - $description = $item['description']; - $idAgentModule = $item['id_agent_module']; - $idAgent = db_get_value_filter( - 'id_agente', - 'tagente_modulo', - ['id_agente_modulo' => $idAgentModule] - ); - $period = $item['period']; - break; - - case 'MTBF': - $description = $item['description']; - $idAgentModule = $item['id_agent_module']; - $idAgent = db_get_value_filter( - 'id_agente', - 'tagente_modulo', - ['id_agente_modulo' => $idAgentModule] - ); - $period = $item['period']; - break; - - case 'MTTR': - $description = $item['description']; - $idAgentModule = $item['id_agent_module']; - $idAgent = db_get_value_filter( - 'id_agente', - 'tagente_modulo', - ['id_agente_modulo' => $idAgentModule] - ); - $period = $item['period']; - break; - */ case 'alert_report_module': $description = $item['description']; $idAgentModule = $item['id_agent_module']; @@ -791,11 +746,6 @@ switch ($action) { case 'avg_value': case 'projection_graph': case 'prediction_date': - /* - case 'TTRT': - case 'TTO': - case 'MTBF': - case 'MTTR':*/ case 'simple_baseline_graph': case 'event_report_log': case 'increment': @@ -3757,10 +3707,6 @@ $(document).ready (function () { case 'event_report_module': case 'simple_graph': case 'simple_baseline_graph': -/* case 'TTRT': - case 'TTO': - case 'MTBF': - case 'MTTR':*/ case 'prediction_date': case 'projection_graph': case 'avg_value': @@ -3798,10 +3744,6 @@ $(document).ready (function () { case 'event_report_module': case 'simple_graph': case 'simple_baseline_graph': -/* case 'TTRT': - case 'TTO': - case 'MTBF': - case 'MTTR':*/ case 'prediction_date': case 'projection_graph': case 'avg_value': @@ -4833,38 +4775,6 @@ function chooseType() { $("#row_period").show(); $("#row_historical_db_check").hide(); break; -/* - case 'TTRT': - $("#row_description").show(); - $("#row_agent").show(); - $("#row_module").show(); - $("#row_period").show(); - $("#row_historical_db_check").hide(); - break; - - case 'TTO': - $("#row_description").show(); - $("#row_agent").show(); - $("#row_module").show(); - $("#row_period").show(); - $("#row_historical_db_check").hide(); - break; - - case 'MTBF': - $("#row_description").show(); - $("#row_agent").show(); - $("#row_module").show(); - $("#row_period").show(); - $("#row_historical_db_check").hide(); - break; - - case 'MTTR': - $("#row_description").show(); - $("#row_agent").show(); - $("#row_module").show(); - $("#row_period").show(); - $("#row_historical_db_check").hide(); - break;*/ case 'alert_report_module': $("#row_description").show(); @@ -5218,10 +5128,6 @@ function chooseType() { case 'min_value': case 'max_value': case 'avg_value': - /* case 'TTRT': - case 'TTO': - case 'MTBF': - case 'MTTR':*/ case 'simple_baseline_graph': $("#row_label").show(); break; diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 40ce45b5bb..823713877b 100755 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -2006,11 +2006,6 @@ switch ($action) { case 'avg_value': case 'projection_graph': case 'prediction_date': - /* - case 'TTRT': - case 'TTO': - case 'MTBF': - case 'MTTR':*/ case 'simple_baseline_graph': case 'nt_top_n': if ($label != '') { @@ -2613,11 +2608,6 @@ switch ($action) { case 'avg_value': case 'projection_graph': case 'prediction_date': - /* - case 'TTRT': - case 'TTO': - case 'MTBF': - case 'MTTR':*/ case 'simple_baseline_graph': case 'nt_top_n': if ($label != '') { diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 1d0355cf97..a5ae07df3e 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -506,43 +506,6 @@ function reporting_make_reporting_data( ); break; - /* - case 'MTTR': - $report['contents'][] = reporting_value( - $report, - $content, - 'MTTR', - $pdf - ); - break; - - case 'MTBF': - $report['contents'][] = reporting_value( - $report, - $content, - 'MTBF', - $pdf - ); - break; - - case 'TTO': - $report['contents'][] = reporting_value( - $report, - $content, - 'TTO', - $pdf - ); - break; - - case 'TTRT': - $report['contents'][] = reporting_value( - $report, - $content, - 'TTRT', - $pdf - ); - break; - */ case 'agent_configuration': $report['contents'][] = io_safe_output( reporting_agent_configuration( @@ -3276,6 +3239,7 @@ function reporting_database_serialized($report, $content) } $return['keys'] = $keys; + $return['agent_name_db'] = agents_get_name($id_agent); $return['agent_name'] = $agent_alias; $return['module_name'] = $module_name; @@ -4303,6 +4267,7 @@ function reporting_monitor_report($report, $content) ); } + $return['agent_name_db'] = agents_get_name($id_agent); $return['agent_name'] = $agent_alias; $return['module_name'] = $module_name; @@ -4475,6 +4440,7 @@ function reporting_prediction_date($report, $content) $agent_name = io_safe_output( modules_get_agentmodule_agent_alias($content['id_agent_module']) ); + $agent_name_db = io_safe_output(modules_get_agentmodule_agent_name($content['id_agent_module'])); $return['title'] = $content['name']; $return['subtitle'] = $agent_name.' - '.$module_name; @@ -4482,6 +4448,7 @@ function reporting_prediction_date($report, $content) $return['date'] = reporting_get_date_text($report, $content); $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : ''; + $return['agent_name_db'] = $agent_name_db; $return['agent_name'] = $agent_name; $return['module_name'] = $module_name; @@ -4526,12 +4493,14 @@ function reporting_projection_graph( $module_name = io_safe_output(modules_get_agentmodule_name($content['id_agent_module'])); $agent_name = io_safe_output(modules_get_agentmodule_agent_alias($content['id_agent_module'])); + $agent_name_db = io_safe_output(modules_get_agentmodule_agent_name($content['id_agent_module'])); $return['title'] = $content['name']; $return['subtitle'] = $agent_name.' - '.$module_name; $return['description'] = $content['description']; $return['date'] = reporting_get_date_text($report, $content); $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : ''; + $return['agent_name_db'] = $agent_name_db; $return['agent_name'] = $agent_name; $return['module_name'] = $module_name; @@ -4727,23 +4696,6 @@ function reporting_value($report, $content, $type, $pdf=false) case 'sum': $return['type'] = 'sumatory'; break; - - /* - case 'MTTR': - $return['type'] = 'MTTR'; - break; - - case 'MTBF': - $return['type'] = 'MTBF'; - break; - - case 'TTO': - $return['type'] = 'TTO'; - break; - - case 'TTRT': - $return['type'] = 'TTRT'; - break;*/ } if (empty($content['name'])) { @@ -4763,23 +4715,6 @@ function reporting_value($report, $content, $type, $pdf=false) case 'sum': $content['name'] = __('Summatory'); break; - - /* - case 'MTTR': - $content['name'] = __('MTTR'); - break; - - case 'MTBF': - $content['name'] = __('MTBF'); - break; - - case 'TTO': - $content['name'] = __('TTO'); - break; - - case 'TTRT': - $content['name'] = __('TTRT'); - break;*/ } } @@ -4796,6 +4731,9 @@ function reporting_value($report, $content, $type, $pdf=false) $agent_name = io_safe_output( modules_get_agentmodule_agent_alias($content['id_agent_module']) ); + $agent_name_db = io_safe_output( + modules_get_agentmodule_agent_name($content['id_agent_module']) + ); $unit = db_get_value( 'unit', 'tagente_modulo', @@ -4812,6 +4750,7 @@ function reporting_value($report, $content, $type, $pdf=false) $return['id_agent'] = $content['id_agent']; $return['id_agent_module'] = $content['id_agent_module']; + $return['agent_name_db'] = $agent_name_db; $return['agent_name'] = $agent_name; $return['module_name'] = $module_name; @@ -4952,51 +4891,6 @@ function reporting_value($report, $content, $type, $pdf=false) $formated_value = format_for_graph($value, $config['graph_precision']).' '.$unit; } break; - - /* - case 'MTTR': - $value = reporting_get_agentmodule_mttr( - $content['id_agent_module'], - $content['period'], - $report['datetime'] - ); - $formated_value = null; - break; - - case 'MTBF': - $value = reporting_get_agentmodule_mtbf( - $content['id_agent_module'], - $content['period'], - $report['datetime'] - ); - $formated_value = null; - break; - - case 'TTO': - $value = reporting_get_agentmodule_tto( - $content['id_agent_module'], - $content['period'], - $report['datetime'] - ); - if ($value == 0) { - $formated_value = null; - } else { - $formated_value = human_time_description_raw($value); - } - break; - - case 'TTRT': - $value = reporting_get_agentmodule_ttr( - $content['id_agent_module'], - $content['period'], - $report['datetime'] - ); - if ($value == 0) { - $formated_value = null; - } else { - $formated_value = human_time_description_raw($value); - } - break;*/ } $return['data'] = [ @@ -7755,6 +7649,7 @@ function reporting_simple_graph( $return['title'] = $content['name']; $return['subtitle'] = $agent_alias.' - '.$module_name; + $return['agent_name_db'] = agents_get_name($id_agent); $return['agent_name'] = $agent_alias; $return['module_name'] = $module_name; $return['description'] = $content['description']; diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php index cf1fa60e70..5dc38d3b9d 100644 --- a/pandora_console/include/functions_reporting_html.php +++ b/pandora_console/include/functions_reporting_html.php @@ -288,23 +288,6 @@ function reporting_html_print_report($report, $mini=false, $report_info=1) reporting_html_sum_value($table, $item, $mini); break; - /* - case 'MTTR': - reporting_html_MTTR_value($table, $item, $mini, true, true); - break; - - case 'MTBF': - reporting_html_MTBF_value($table, $item, $mini, true, true); - break; - - case 'TTO': - reporting_html_TTO_value($table, $item, $mini, false, true); - break; - - case 'TTRT': - reporting_html_TTRT_value($table, $item, $mini, false, true); - break; - */ case 'agent_configuration': reporting_html_agent_configuration($table, $item); break; @@ -2729,31 +2712,6 @@ function reporting_html_agent_configuration( } -/* - function reporting_html_TTRT_value(&$table, $item, $mini, $only_value=false, $check_empty=false) - { - reporting_html_value($table, $item, $mini, $only_value, $check_empty); - } - - - function reporting_html_TTO_value(&$table, $item, $mini, $only_value=false, $check_empty=false) - { - reporting_html_value($table, $item, $mini, $only_value, $check_empty); - } - - - function reporting_html_MTBF_value(&$table, $item, $mini, $only_value=false, $check_empty=false) - { - reporting_html_value($table, $item, $mini, $only_value, $check_empty); - } - - - function reporting_html_MTTR_value(&$table, $item, $mini, $only_value=false, $check_empty=false) - { - reporting_html_value($table, $item, $mini, $only_value, $check_empty); - } -*/ - function reporting_html_sum_value(&$table, $item, $mini) { reporting_html_value($table, $item, $mini); diff --git a/pandora_console/include/functions_reports.php b/pandora_console/include/functions_reports.php index 319690946e..e20fdd01fa 100755 --- a/pandora_console/include/functions_reports.php +++ b/pandora_console/include/functions_reports.php @@ -679,24 +679,6 @@ function reports_get_report_types($template=false, $not_editor=false) 'name' => __('Module Histogram graph'), ]; - /* - $types['TTRT'] = [ - 'optgroup' => __('ITIL'), - 'name' => __('TTRT'), - ]; - $types['TTO'] = [ - 'optgroup' => __('ITIL'), - 'name' => __('TTO'), - ]; - $types['MTBF'] = [ - 'optgroup' => __('ITIL'), - 'name' => __('MTBF'), - ]; - $types['MTTR'] = [ - 'optgroup' => __('ITIL'), - 'name' => __('MTTR'), - ]; - */ $types['SLA'] = [ 'optgroup' => __('SLA'), 'name' => __('S.L.A.'),