From 5333dbb6e30e669c45ea4869419bd2f3802ce0d3 Mon Sep 17 00:00:00 2001 From: Calvo Date: Thu, 29 Jun 2023 17:06:59 +0200 Subject: [PATCH 1/6] WIP:Automonitorization Upgrades --- pandora_server/bin/pandora_server | 1 + pandora_server/lib/PandoraFMS/Core.pm | 212 +++++++++++++++++- pandora_server/lib/PandoraFMS/DB.pm | 15 ++ .../lib/PandoraFMS/ProducerConsumerServer.pm | 6 +- pandora_server/lib/PandoraFMS/Tools.pm | 80 +++++++ 5 files changed, 308 insertions(+), 6 deletions(-) diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server index 8530b998c4..0de5d7e66a 100755 --- a/pandora_server/bin/pandora_server +++ b/pandora_server/bin/pandora_server @@ -551,6 +551,7 @@ sub pandora_server_tasks ($) { && !is_metaconsole($pa_config) && $counter % $pa_config->{'self_monitoring_interval'} == 0) { pandora_self_monitoring ($pa_config, $dbh); + pandora_installation_monitoring($pa_config, $dbh); } }; diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 4fa53ee296..3a5ca2f513 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -102,6 +102,8 @@ Exported Functions: =item * C +=item * C + =back =head1 METHODS @@ -129,7 +131,7 @@ use Text::ParseWords; use Math::Trig; # Math functions # Debugging -#use Data::Dumper; +use Data::Dumper; # Force XML::Simple to use XML::Parser instead SAX to manage XML # due a bug processing some XML with blank spaces. @@ -262,6 +264,7 @@ our @EXPORT = qw( pandora_server_statistics pandora_self_monitoring pandora_thread_monitoring + pandora_installation_monitoring pandora_process_policy_queue pandora_sync_agents_integria pandora_get_integria_ticket_types @@ -6094,6 +6097,13 @@ sub pandora_self_monitoring ($$) { my $free_disk_spool = disk_free ($pa_config->{"incomingdir"}); $free_disk_spool = '' unless defined ($free_disk_spool); my $my_data_server = get_db_value ($dbh, "SELECT id_server FROM tserver WHERE server_type = ? AND name = '".$pa_config->{"servername"}."'", DATASERVER); + my $total_mem = total_mem(); + my $free_mem_percentage; + if(defined($total_mem) && $free_mem ne '') { + $free_mem_percentage = ($free_mem / $total_mem ) * 100; + } else { + $free_mem_percentage = ''; + } # Number of unknown agents my $agents_unknown = 0; @@ -6124,6 +6134,37 @@ sub pandora_self_monitoring ($$) { } my $elasticsearch_perfomance = enterprise_hook("elasticsearch_performance", [$pa_config, $dbh]); + my $num_threads = 0; + $num_threads = get_db_value ($dbh, "SELECT SUM(threads) FROM tserver WHERE name = '".$pa_config->{"servername"}."'"); + my $cpu_load = 0; + $cpu_load = cpu_load(); + + + ## Modules Networks average. + my $totalNetworkModules = get_db_value( + $dbh, + 'SELECT count(*) + FROM tagente_modulo + WHERE id_tipo_modulo + BETWEEN 6 AND 18' + ); + + my $totalModuleIntervalTime = get_db_value( + $dbh, + 'SELECT SUM(module_interval) + FROM tagente_modulo + WHERE id_tipo_modulo + BETWEEN 6 AND 18' + ); + + my $data_in_files = count_files_ext($pa_config->{"incomingdir"}, 'data'); + my $data_in_files_badxml = count_files_ext($pa_config->{"incomingdir"}, 'data_BADXML'); + my $averageTime = 0; + + if (defined($totalModuleIntervalTime) && defined($totalNetworkModules)) { + $averageTime = $totalNetworkModules / $totalModuleIntervalTime; + } + $xml_output .= $elasticsearch_perfomance if defined($elasticsearch_perfomance); @@ -6160,7 +6201,14 @@ sub pandora_self_monitoring ($$) { $xml_output .=" $free_mem"; $xml_output .=" "; } - + + $xml_output .=" "; + $xml_output .=" Free_RAM_perccentage"; + $xml_output .=" generic_data"; + $xml_output .=" $free_mem_percentage"; + $xml_output .=" %"; + $xml_output .=" "; + if (defined($free_disk_spool)) { $xml_output .=" "; $xml_output .=" FreeDisk_SpoolDir"; @@ -6169,6 +6217,43 @@ sub pandora_self_monitoring ($$) { $xml_output .=" "; } + $xml_output .=" "; + $xml_output .=" Total Threads"; + $xml_output .=" generic_data"; + $xml_output .=" $num_threads"; + $xml_output .=" "; + + $xml_output .=" "; + $xml_output .=" CPU Load"; + $xml_output .=" generic_data"; + $xml_output .=" $cpu_load"; + $xml_output .=" %"; + $xml_output .=" "; + + $xml_output .=" "; + $xml_output .=" Network Modules Int AVG"; + $xml_output .=" generic_data"; + $xml_output .=" $averageTime"; + $xml_output .=" seconds"; + $xml_output .=" "; + + if(defined($data_in_files)) { + $xml_output .=" "; + $xml_output .=" Data_in_files"; + $xml_output .=" generic_data"; + $xml_output .=" $data_in_files"; + $xml_output .=" "; + } + + if(defined($data_in_files_badxml)) { + $xml_output .=" "; + $xml_output .=" Data_in_BADXML_files"; + $xml_output .=" generic_data"; + $xml_output .=" $data_in_files_badxml"; + $xml_output .=" "; + } + + $xml_output .= ""; my $filename = $pa_config->{"incomingdir"}."/".$pa_config->{'servername'}.".self.".$utimestamp.".data"; @@ -6192,15 +6277,21 @@ sub pandora_thread_monitoring ($$$) { my $timestamp = strftime ("%Y-%m-%d %H:%M:%S", localtime()); my $xml_output = ""; - + my $module_parent = ""; + + # All trhead modules are "Status" module sons. + $module_parent = 'Status'; + $xml_output = "{'version'} . "' agent_name='".$pa_config->{'servername'} . "' agent_alias='".$pa_config->{'servername'} . "' interval='".$pa_config->{"self_monitoring_interval"}."' timestamp='".$timestamp."' >"; foreach my $server (@{$servers}) { - while (my ($tid, $stats) = each(%{$server->getProducerStats()})) { + my $producer_stats = $server->getProducerStats(); + while (my ($tid, $stats) = each(%{$producer_stats})) { $xml_output .=" "; $xml_output .=" " . uc($ServerTypes[$server->{'_server_type'}]) . " Producer Status"; $xml_output .=" generic_proc"; $xml_output .=" System"; $xml_output .=" " . (time() - $stats->{'tstamp'} < 2 * $pa_config->{"self_monitoring_interval"} ? 1 : 0) . ""; + $xml_output .=" " . $module_parent . ""; $xml_output .=" "; $xml_output .=" "; @@ -6209,6 +6300,16 @@ sub pandora_thread_monitoring ($$$) { $xml_output .=" Performance"; $xml_output .=" " . $stats->{'rate'} . ""; $xml_output .=" tasks/second"; + $xml_output .=" " . $module_parent . ""; + $xml_output .=" "; + + $xml_output .=" "; + $xml_output .=" " . uc($ServerTypes[$server->{'_server_type'}]) . " Producer Queued Elements"; + $xml_output .=" generic_data"; + $xml_output .=" Performance"; + $xml_output .=" " . ($#{$stats->{'task_queue'}} + 1) . ""; + $xml_output .=" tasks"; + $xml_output .=" " . $module_parent . ""; $xml_output .=" "; } @@ -6223,6 +6324,7 @@ sub pandora_thread_monitoring ($$$) { $xml_output .=" generic_proc"; $xml_output .=" System"; $xml_output .=" " . (time() - $stats->{'tstamp'} < 2 * $pa_config->{"self_monitoring_interval"} ? 1 : 0) . ""; + $xml_output .=" " . $module_parent . ""; $xml_output .=" "; $xml_output .=" "; @@ -6230,8 +6332,18 @@ sub pandora_thread_monitoring ($$$) { $xml_output .=" generic_data"; $xml_output .=" Performance"; $xml_output .=" " . $stats->{'rate'} . ""; + $xml_output .=" " . $module_parent . ""; $xml_output .=" tasks/second"; $xml_output .=" "; + + $xml_output .=" "; + $xml_output .=" " . uc($ServerTypes[$server->{'_server_type'}]) . " Producer Queued Elements"; + $xml_output .=" generic_data"; + $xml_output .=" Performance"; + $xml_output .=" " . ($#{$stats->{'task_queue'}} + 1) . ""; + $xml_output .=" tasks"; + $xml_output .=" " . $module_parent . ""; + $xml_output .=" "; } } $xml_output .= ""; @@ -6242,6 +6354,98 @@ sub pandora_thread_monitoring ($$$) { close (XMLFILE); } +########################################################################## +=head2 C<< pandora_installation_monitoring (I<$pa_config>, I<$dbh>, I<$servers>) >> + +Generate stats for Pandora FMS threads. + +=cut +########################################################################## +sub pandora_installation_monitoring($$) { + my ($pa_config, $dbh) = @_; + + my $utimestamp = time (); + my $timestamp = strftime ("%Y-%m-%d %H:%M:%S", localtime()); + my @modules; + + my $xml_output = ""; + $xml_output = "{'version'} . "' agent_name='pandora.internals' agent_alias='pandora.internals' interval='".$pa_config->{"self_monitoring_interval"}."' timestamp='".$timestamp."' >"; + + # Total amount of agents + my $module; + $module->{'name'} = "total_agents"; + $module->{'description'} = 'Total amount of agents'; + $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(DISTINCT(id_agente)) FROM tagente'); + push(@modules, $module); + undef $module; + # Total amount of modules + $module->{'name'} = "total_modules"; + $module->{'description'} = 'Total modules'; + $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(DISTINCT(id_agente_modulo)) FROM tagente_modulo'); + push(@modules, $module); + undef $module; + # Total groups + $module->{'name'} = "total_groups"; + $module->{'description'} = 'Total groups'; + $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(DISTINCT(id_grupo)) FROM tgrupo'); + push(@modules, $module); + undef $module; + # Total module data records + $module->{'name'} = "total_data"; + $module->{'description'} = 'Total module data records'; + $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(*) FROM tagente_datos'); + $module->{'interval'} = '86400'; + push(@modules, $module); + undef $module; + # Total module strimg data records + $module->{'name'} = "total_string_data"; + $module->{'description'} = 'Total module string data records'; + $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(*) FROM tagente_datos_string'); + $module->{'interval'} = '86400'; + push(@modules, $module); + undef $module; + # Total agent access record + $module->{'name'} = "total_access_data"; + $module->{'description'} = 'Total agent access records'; + $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(*) FROM tagent_access'); + push(@modules, $module); + undef $module; + + print Dumper(@modules); + foreach my $module_data (@modules) { + $xml_output .=" "; + $xml_output .=" " .$module_data->{'name'}. ""; + $xml_output .=" " . $module_data->{'data'} . ""; + + if(defined($module->{'description'})) { + $xml_output .=" " .$module_data->{'decription'}. ""; + } + if(defined($module->{'type'})) { + $xml_output .=" " .$module_data->{'type'}. ""; + } else { + $xml_output .=" generic_data"; + } + if(defined($module->{'unit'})) { + $xml_output .=" " .$module_data->{'unit'}. ""; + } + if(defined($module->{'module_parent'})) { + $xml_output .=" " .$module_data->{'module_parent'}. ""; + } + if(defined($module->{'interval'})) { + $xml_output .=" " .$module_data->{'interval'}. ""; + } + + $xml_output .=" "; + } + + $xml_output .= ""; + + my $filename = $pa_config->{"incomingdir"}."/pandora.internals.".$utimestamp.".data"; + open (XMLFILE, ">", $filename) or die "[FATAL] Could not write to the thread monitoring XML file '$filename'"; + print XMLFILE $xml_output; + close (XMLFILE); +} + ########################################################################## =head2 C<< set_master (I<$pa_config>, I<$dbh>) >> diff --git a/pandora_server/lib/PandoraFMS/DB.pm b/pandora_server/lib/PandoraFMS/DB.pm index c7544de2f7..0ece8d0c74 100644 --- a/pandora_server/lib/PandoraFMS/DB.pm +++ b/pandora_server/lib/PandoraFMS/DB.pm @@ -71,6 +71,7 @@ our @EXPORT = qw( get_agent_group get_agent_name get_agent_module_id + get_agent_module_id_by_name get_alert_template_module_id get_alert_template_name get_command_id @@ -698,6 +699,20 @@ sub get_agent_module_id ($$$) { return defined ($rc) ? $rc : -1; } +######################################################################## +## Return module id given the module name and agent name. +######################################################################## +sub get_agent_module_id_by_name ($$$) { + my ($dbh, $module_name, $agent_name) = @_; + + my $rc = get_db_value ( + $dbh, + 'SELECT id_agente_modulo + FROM tagente_modulo tam LEFT JOIN tagente ta ON tam.id_agente = ta.id_agente + WHERE tam.nombre = ? AND ta.nombre = ?', safe_input($module_name), $agent_name); + return defined ($rc) ? $rc : -1; +} + ########################################################################## ## Return template id given the template name. ########################################################################## diff --git a/pandora_server/lib/PandoraFMS/ProducerConsumerServer.pm b/pandora_server/lib/PandoraFMS/ProducerConsumerServer.pm index 770bc06522..51b0c3f35e 100644 --- a/pandora_server/lib/PandoraFMS/ProducerConsumerServer.pm +++ b/pandora_server/lib/PandoraFMS/ProducerConsumerServer.pm @@ -95,7 +95,8 @@ sub run ($$$$$) { 'tstamp' => time(), 'rate' => 0, 'rate_count' => 0, - 'rate_tstamp' => time() + 'rate_tstamp' => time(), + 'task_queue' => $task_queue, }); my $thr = threads->create ({'exit' => 'thread_only'}, @@ -127,7 +128,8 @@ sub run ($$$$$) { 'tstamp' => time(), 'rate' => 0, 'rate_count' => 0, - 'rate_tstamp' => time() + 'rate_tstamp' => time(), + 'task_queue' => $task_queue, }); # Launch producer thread diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm index fb4b551a3a..8ffdba454b 100755 --- a/pandora_server/lib/PandoraFMS/Tools.pm +++ b/pandora_server/lib/PandoraFMS/Tools.pm @@ -140,6 +140,9 @@ our @EXPORT = qw( disk_free load_average free_mem + total_mem + cpu_load + count_files_ext md5 md5_init pandora_ping @@ -1405,6 +1408,83 @@ sub free_mem { return $free_mem; } +sub total_mem { + my $total_mem; + + my $OSNAME = $^O; + + if ($OSNAME eq "freebsd"){ + $total_mem = `/sbin/sysctl sysctl -b hw.physmem`; + # in kilobytes + $total_mem = $total_mem / 1024; + + } + elsif ($OSNAME eq "netbsd"){ + $total_mem = `cat /proc/meminfo | grep MemTotal | awk '{ print \$2 }'`; + } + elsif ($OSNAME eq "MSWin32"){ + $total_mem = `wmic ComputerSystem get TotalPhysicalMemory /Value`; + if ($total_mem =~ m/=(.*)$/gm) { + $total_mem = $1; + } else { + $total_mem = undef; + } + } + # by default LINUX calls + else { + $total_mem = `free | grep Mem | awk '{ print \$2 }'`; + } + return $total_mem; +} + + +################################################################################ +## SUB CPU load + # Get CPU load (%) +################################################################################ +sub cpu_load { + my $cpu_load; + + my $OSNAME = $^O; + + if ($OSNAME eq "MSWin32"){ + $cpu_load = `wmic cpu get loadpercentage|find /I /V "Loadpercentage" | findstr /r "[0-9]" `; + } + # by default LINUX calls + else { + $cpu_load = `top -bn 2 -d 0.01 | grep 'Cpu' | tail -n 1 | awk '{ print \$2+\$4+\$6 }'`; + } + + return $cpu_load; +} + +################################################################################ +## SUB count_files + # Count files in an specific folder by extension +################################################################################ +sub count_files_ext($$) { + my($path, $ext) = @_; + + my $count=0; + my $OSNAME = $^O; + + if ($OSNAME eq "MSWin32"){ + $path =~ '/^([a-zA-Z]:)?(\\\\[^\\/:*?\"<>|]+)*\\\\?/'; + my $drive = $1; + my $folder = $2; + + $count = `wmic datafile where "drive=\'$drive\' and path=\'$folder\' and extension=\'$ext\'" get /value | find /c "="`; + if ($count =~ m/=(.*)$/gm) { + $count = $1; + } + $count = undef; + + } else { + $count = `find $path -type f -name "*.$ext" | wc -l` + } + + return $count; +} ################################################################################ ## SUB ticks_totime # Transform a snmp timeticks count in a date From 538a2b90b7ccfc364a47080db46307c84654712d Mon Sep 17 00:00:00 2001 From: Calvo Date: Mon, 3 Jul 2023 17:48:47 +0200 Subject: [PATCH 2/6] WIP:Automonitorization Upgrades --- pandora_server/lib/PandoraFMS/Core.pm | 96 ++++++++++++++++++++++++--- 1 file changed, 88 insertions(+), 8 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 3a5ca2f513..452b4d4825 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -6378,18 +6378,21 @@ sub pandora_installation_monitoring($$) { $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(DISTINCT(id_agente)) FROM tagente'); push(@modules, $module); undef $module; + # Total amount of modules $module->{'name'} = "total_modules"; $module->{'description'} = 'Total modules'; $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(DISTINCT(id_agente_modulo)) FROM tagente_modulo'); push(@modules, $module); undef $module; + # Total groups $module->{'name'} = "total_groups"; $module->{'description'} = 'Total groups'; $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(DISTINCT(id_grupo)) FROM tgrupo'); push(@modules, $module); undef $module; + # Total module data records $module->{'name'} = "total_data"; $module->{'description'} = 'Total module data records'; @@ -6404,6 +6407,7 @@ sub pandora_installation_monitoring($$) { $module->{'interval'} = '86400'; push(@modules, $module); undef $module; + # Total agent access record $module->{'name'} = "total_access_data"; $module->{'description'} = 'Total agent access records'; @@ -6411,28 +6415,104 @@ sub pandora_installation_monitoring($$) { push(@modules, $module); undef $module; - print Dumper(@modules); + # Tables fragmentation + $module->{'name'} = "tables_fragmentation"; + $module->{'description'} = 'Tables fragmentation'; + $module->{'data'} = get_db_value( + $dbh, + "SELECT + MAX( (data_free / data_length) / 100) AS frag_percent_max + FROM + information_schema.tables + WHERE + table_schema not in ('information_schema', 'mysql') + AND table_name NOT IN ('tagent_access, tevento')" + ); + $module->{'unit'} = '%'; + push(@modules, $module); + undef $module; + + # License Usage + $module->{'name'} = "license_usage"; + $module->{'description'} = 'License Usage'; + $module->{'unit'} = '%'; + my $license_usage = enterprise_hook('get_license_usage',[$dbh]); + if(! defined($license_usage)) { + $module->{'data'} = 0; + } else { + $module->{'data'} = $license_usage; + } + push(@modules, $module); + undef $module; + + # General info about queries + my $select = get_db_value($dbh, 'SHOW /*!50000 GLOBAL */ STATUS WHERE Variable_name= ?', 'Com_select'); + my $insert = get_db_value($dbh, 'SHOW /*!50000 GLOBAL */ STATUS WHERE Variable_name= ?', 'Com_insert'); + my $update = get_db_value($dbh, 'SHOW /*!50000 GLOBAL */ STATUS WHERE Variable_name= ?', 'Com_update'); + my $replace = get_db_value($dbh, 'SHOW /*!50000 GLOBAL */ STATUS WHERE Variable_name= ?', 'Com_replace'); + my $delete = get_db_value($dbh, 'SHOW /*!50000 GLOBAL */ STATUS WHERE Variable_name= ?', 'Com_delete'); + my $data_size = get_db_value($dbh, 'SELECT SUM(data_length)/(1024*1024) FROM information_schema.TABLES'); + my $index_size = get_db_value($dbh, 'SELECT SUM(index_length)/(1024*1024) FROM information_schema.TABLES'); + my $writes = $insert + $update + $replace + $delete; + + # Mysql Questions - Reads + $module->{'name'} = "mysql_questions_reads"; + $module->{'description'} = 'MySQL: Questions - Reads (#): Number of read questions'; + $module->{'data'} = $select; + $module->{'unit'} = 'qu'; + push(@modules, $module); + undef $module; + + # Mysql Questions - Writes + my $question_writes = 0; + if(($writes + $select) > 0) { + $question_writes = (($writes * 10000) / ($select + $writes)) / 100; + } + $module->{'name'} = "mysql_questions_writes"; + $module->{'description'} = 'MySQL: Questions - Writes (#): Number of writed questions'; + $module->{'data'} = $question_writes; + $module->{'unit'} = 'qu'; + push(@modules, $module); + undef $module; + + # Mysql Size of data + $module->{'name'} = "mysql_size_of_data"; + $module->{'description'} = 'MySQL: Size of data (MB): Size of stored data in megabytes'; + $module->{'data'} = $data_size; + $module->{'unit'} = 'MB'; + push(@modules, $module); + undef $module; + + # Mysql Size of indexed + $module->{'name'} = "mysql_size_of_indexes"; + $module->{'description'} = 'Size of indexes (MB): Size of stored indexes in megabytes'; + $module->{'data'} = $index_size; + $module->{'unit'} = 'MB'; + push(@modules, $module); + undef $module; + + # Build xml modules. foreach my $module_data (@modules) { $xml_output .=" "; $xml_output .=" " .$module_data->{'name'}. ""; $xml_output .=" " . $module_data->{'data'} . ""; - if(defined($module->{'description'})) { - $xml_output .=" " .$module_data->{'decription'}. ""; + if(defined($module_data->{'description'})) { + $xml_output .=" " .$module_data->{'description'}. ""; } - if(defined($module->{'type'})) { + if(defined($module_data->{'type'})) { $xml_output .=" " .$module_data->{'type'}. ""; } else { $xml_output .=" generic_data"; } - if(defined($module->{'unit'})) { + if(defined($module_data->{'unit'})) { $xml_output .=" " .$module_data->{'unit'}. ""; } - if(defined($module->{'module_parent'})) { + if(defined($module_data->{'module_parent'})) { $xml_output .=" " .$module_data->{'module_parent'}. ""; } - if(defined($module->{'interval'})) { - $xml_output .=" " .$module_data->{'interval'}. ""; + if(defined($module_data->{'interval'})) { + $xml_output .=" " .$module_data->{'interval'}. ""; } $xml_output .=" "; From 5f7efb92b8b71209b791c310b68642b8ef92900c Mon Sep 17 00:00:00 2001 From: Calvo Date: Wed, 5 Jul 2023 10:09:48 +0200 Subject: [PATCH 3/6] WIP: Automonitoring. Installation monitor --- pandora_server/lib/PandoraFMS/Core.pm | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 452b4d4825..a8bb2a9e87 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -6446,19 +6446,19 @@ sub pandora_installation_monitoring($$) { undef $module; # General info about queries - my $select = get_db_value($dbh, 'SHOW /*!50000 GLOBAL */ STATUS WHERE Variable_name= ?', 'Com_select'); - my $insert = get_db_value($dbh, 'SHOW /*!50000 GLOBAL */ STATUS WHERE Variable_name= ?', 'Com_insert'); - my $update = get_db_value($dbh, 'SHOW /*!50000 GLOBAL */ STATUS WHERE Variable_name= ?', 'Com_update'); - my $replace = get_db_value($dbh, 'SHOW /*!50000 GLOBAL */ STATUS WHERE Variable_name= ?', 'Com_replace'); - my $delete = get_db_value($dbh, 'SHOW /*!50000 GLOBAL */ STATUS WHERE Variable_name= ?', 'Com_delete'); + my $select = get_db_single_row($dbh, 'SHOW /*!50000 GLOBAL */ STATUS WHERE Variable_name= ?', 'Com_select'); + my $insert = get_db_single_row($dbh, 'SHOW /*!50000 GLOBAL */ STATUS WHERE Variable_name= ?', 'Com_insert'); + my $update = get_db_single_row($dbh, 'SHOW /*!50000 GLOBAL */ STATUS WHERE Variable_name= ?', 'Com_update'); + my $replace = get_db_single_row($dbh, 'SHOW /*!50000 GLOBAL */ STATUS WHERE Variable_name= ?', 'Com_replace'); + my $delete = get_db_single_row($dbh, 'SHOW /*!50000 GLOBAL */ STATUS WHERE Variable_name= ?', 'Com_delete'); my $data_size = get_db_value($dbh, 'SELECT SUM(data_length)/(1024*1024) FROM information_schema.TABLES'); my $index_size = get_db_value($dbh, 'SELECT SUM(index_length)/(1024*1024) FROM information_schema.TABLES'); - my $writes = $insert + $update + $replace + $delete; + my $writes = $insert->{'Value'} + $update->{'Value'} + $replace->{'Value'} + $delete->{'Value'} ; # Mysql Questions - Reads $module->{'name'} = "mysql_questions_reads"; $module->{'description'} = 'MySQL: Questions - Reads (#): Number of read questions'; - $module->{'data'} = $select; + $module->{'data'} = $select->{'Value'}; $module->{'unit'} = 'qu'; push(@modules, $module); undef $module; @@ -6491,6 +6491,17 @@ sub pandora_installation_monitoring($$) { push(@modules, $module); undef $module; + # Mysql process list + my $command = 'mysql -u '.$pa_config->{'dbuser'}.' -p"'.$pa_config->{'dbpass'}.'" -e "show processlist"'; + print Dumper($command); + my $process_list = `$command 2>$DEVNULL`; + $module->{'name'} = 'mysql_transactions_list'; + $module->{'description'} = 'MySQL: Transactions list'; + $module->{'data'} = ''; + $module->{'type'} = 'generic_data_string'; + push(@modules, $module); + undef $module; + # Build xml modules. foreach my $module_data (@modules) { $xml_output .=" "; From 7a16163371e361c30937bacd3ac3820d68f907e7 Mon Sep 17 00:00:00 2001 From: Calvo Date: Mon, 18 Sep 2023 17:34:28 +0200 Subject: [PATCH 4/6] WIP: Automonitorization modules --- pandora_server/lib/PandoraFMS/Core.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index e9c40b0b72..841cbc86f0 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -6153,7 +6153,6 @@ sub pandora_self_monitoring ($$) { $pandoradb = 1; } - my $elasticsearch_perfomance = enterprise_hook("elasticsearch_performance", [$pa_config, $dbh]); my $num_threads = 0; $num_threads = get_db_value ($dbh, "SELECT SUM(threads) FROM tserver WHERE name = '".$pa_config->{"servername"}."'"); my $cpu_load = 0; @@ -6186,7 +6185,6 @@ sub pandora_self_monitoring ($$) { } - $xml_output .= $elasticsearch_perfomance if defined($elasticsearch_perfomance); $xml_output .=" "; $xml_output .=" Database Maintenance"; @@ -6513,7 +6511,6 @@ sub pandora_installation_monitoring($$) { # Mysql process list my $command = 'mysql -u '.$pa_config->{'dbuser'}.' -p"'.$pa_config->{'dbpass'}.'" -e "show processlist"'; - print Dumper($command); my $process_list = `$command 2>$DEVNULL`; $module->{'name'} = 'mysql_transactions_list'; $module->{'description'} = 'MySQL: Transactions list'; @@ -6549,6 +6546,11 @@ sub pandora_installation_monitoring($$) { $xml_output .=" "; } + # Opensearch monitoring + my $elasticsearch_perfomance = enterprise_hook("elasticsearch_performance", [$pa_config, $dbh]); + $xml_output .= $elasticsearch_perfomance if defined($elasticsearch_perfomance); + + $xml_output .= ""; my $filename = $pa_config->{"incomingdir"}."/pandora.internals.".$utimestamp.".data"; From 438393ed99260d4a39061ad774a883971bf3d248 Mon Sep 17 00:00:00 2001 From: Calvo Date: Wed, 20 Sep 2023 18:33:15 +0200 Subject: [PATCH 5/6] WIP: Automonitorization modules. WUX and Alerts --- pandora_server/lib/PandoraFMS/Core.pm | 236 +++++++++++++++++++++++++- 1 file changed, 228 insertions(+), 8 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 021bb5d7c2..e917626d58 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -104,6 +104,8 @@ Exported Functions: =item * C +=item * C + =back =head1 METHODS @@ -6419,6 +6421,7 @@ sub pandora_installation_monitoring($$) { $module->{'name'} = "total_agents"; $module->{'description'} = 'Total amount of agents'; $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(DISTINCT(id_agente)) FROM tagente'); + $module->{'module_group'} = 'Database'; push(@modules, $module); undef $module; @@ -6426,6 +6429,7 @@ sub pandora_installation_monitoring($$) { $module->{'name'} = "total_modules"; $module->{'description'} = 'Total modules'; $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(DISTINCT(id_agente_modulo)) FROM tagente_modulo'); + $module->{'module_group'} = 'Database'; push(@modules, $module); undef $module; @@ -6433,28 +6437,73 @@ sub pandora_installation_monitoring($$) { $module->{'name'} = "total_groups"; $module->{'description'} = 'Total groups'; $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(DISTINCT(id_grupo)) FROM tgrupo'); + $module->{'module_group'} = 'Database'; push(@modules, $module); undef $module; # Total module data records $module->{'name'} = "total_data"; $module->{'description'} = 'Total module data records'; - $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(*) FROM tagente_datos'); - $module->{'interval'} = '86400'; + $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(id_agente_modulo) FROM tagente_datos'); + $module->{'module_interval'} = '86400'; + $module->{'module_group'} = 'Database'; push(@modules, $module); undef $module; + # Total module strimg data records $module->{'name'} = "total_string_data"; $module->{'description'} = 'Total module string data records'; - $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(*) FROM tagente_datos_string'); - $module->{'interval'} = '86400'; + $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(id_agente_modulo) FROM tagente_datos_string'); + $module->{'module_interval'} = '86400'; + $module->{'module_group'} = 'Database'; push(@modules, $module); undef $module; # Total agent access record $module->{'name'} = "total_access_data"; $module->{'description'} = 'Total agent access records'; - $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(*) FROM tagent_access'); + $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(id_agent) FROM tagent_access'); + $module->{'module_group'} = 'Database'; + push(@modules, $module); + undef $module; + + # Total users + $module->{'name'} = "total_users"; + $module->{'description'} = 'Total users'; + $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(id_user) FROM tusuario'); + $module->{'module_group'} = 'Database'; + push(@modules, $module); + undef $module; + + # Total sessions + $module->{'name'} = "total_users"; + $module->{'description'} = 'Total users'; + $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(id_session) FROM tsessions_php'); + $module->{'module_group'} = 'Database'; + push(@modules, $module); + undef $module; + + # Total unknown agents + $module->{'name'} = "total_unknown"; + $module->{'description'} = 'Total unknown agents'; + $module->{'data'} = get_db_value ( + $dbh, + "SELECT COUNT(DISTINCT tagente_estado.id_agente) + FROM tagente_estado, tagente, tagente_modulo + WHERE tagente.disabled = 0 AND tagente.id_agente = tagente_estado.id_agente + AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo + AND tagente_modulo.disabled = 0 + AND estado = 3" + ); + $module->{'module_group'} = 'Database'; + push(@modules, $module); + undef $module; + + # Total notinit modules + $module->{'name'} = "total_notinit"; + $module->{'description'} = 'Total not init modules'; + $module->{'data'} = get_db_value($dbh, "SELECT COUNT(DISTINCT(id_agente_modulo)) FROM tagente_estado WHERE estado = 4"); + $module->{'module_group'} = 'Database'; push(@modules, $module); undef $module; @@ -6472,6 +6521,7 @@ sub pandora_installation_monitoring($$) { AND table_name NOT IN ('tagent_access, tevento')" ); $module->{'unit'} = '%'; + $module->{'module_group'} = 'Database'; push(@modules, $module); undef $module; @@ -6544,7 +6594,70 @@ sub pandora_installation_monitoring($$) { push(@modules, $module); undef $module; - # Build xml modules. + # Log monitoring + my $log_files = { + 'server_log' => $pa_config->{'log_file'}, + 'server_error' => $pa_config->{'errorlog_file'}, + }; + + if(pandora_get_tconfig_token($dbh,'console_log_enabled', 0) == 1) { + $log_files->{'console_log'} = '/var/www/html/pandora_consle/log/console.log'; + } + + if(pandora_get_tconfig_token($dbh,'audit_log_enabled', 0) == 1) { + $log_files->{'audit_log'} = '/var/www/html/pandora_consle/log/audit.log'; + } + + foreach my $log_source (keys %{$log_files}) { + my $log_name = $log_source ; + my $size = -s $log_files->{$log_source}; + my $size_in_mb; + + if(defined($size) && $size != 0) { + $size_in_mb = $size / (1024 * 1024); + } else { + $size_in_mb = 0; + } + + $module->{'name'} = $log_name.'_size'; + $module->{'description'} = 'Size of '.$log_name.' (MB): Size of '.$log_name.' in megabytes'; + $module->{'data'} = $size_in_mb; + $module->{'unit'} = 'MB'; + $module->{'min_critical'} = 1024; + $module->{'max_critical'} = 0; + push(@modules, $module); + undef $module; + + # Alert monitoring + # Defined alerts + my $total_alerts = get_db_value( + $dbh, + 'SELECT + (SELECT COUNT(id) FROM talert_template_modules WHERE disabled = 0 AND standby = 0 AND disabled_by_downtime = 0) + + (SELECT COUNT(id) FROM tevent_alert WHERE disabled = 0 AND standby = 0) AS Total' + ); + $module->{'name'} = "defined_alers"; + $module->{'description'} = 'Number of defined (and active) alerts'; + $module->{'data'} = $total_alerts; + push(@modules, $module); + undef $module; + + # Last 24 hours triggered alerts. + my $triggered_alerts = get_db_value( + $dbh, + 'SELECT COUNT(id) + FROM talert_template_modules + WHERE last_fired >=UNIX_TIMESTAMP(NOW() - INTERVAL 1 DAY)' + ); + $module->{'name'} = "triggered_alerts"; + $module->{'description'} = 'Last 24h triggered alerts'; + $module->{'data'} = $triggered_alerts; + push(@modules, $module); + undef $module; + + + } + foreach my $module_data (@modules) { $xml_output .=" "; $xml_output .=" " .$module_data->{'name'}. ""; @@ -6564,8 +6677,23 @@ sub pandora_installation_monitoring($$) { if(defined($module_data->{'module_parent'})) { $xml_output .=" " .$module_data->{'module_parent'}. ""; } - if(defined($module_data->{'interval'})) { - $xml_output .=" " .$module_data->{'interval'}. ""; + if(defined($module_data->{'module_interval'})) { + $xml_output .=" " .$module_data->{'module_interval'}. ""; + } + if(defined($module_data->{'max_critical'})) { + $xml_output .=" " .$module_data->{'max_critical'}. ""; + } + if(defined($module_data->{'min_critical'})) { + $xml_output .=" " .$module_data->{'min_critical'}. ""; + } + if(defined($module_data->{'max_warning'})) { + $xml_output .=" " .$module_data->{'max_warning'}. ""; + } + if(defined($module_data->{'min_warning'})) { + $xml_output .=" " .$module_data->{'min_warning'}. ""; + } + if(defined($module_data->{'module_group'})) { + $xml_output .=" " .$module_data->{'module_group'}. ""; } $xml_output .=" "; @@ -6575,6 +6703,13 @@ sub pandora_installation_monitoring($$) { my $elasticsearch_perfomance = enterprise_hook("elasticsearch_performance", [$pa_config, $dbh]); $xml_output .= $elasticsearch_perfomance if defined($elasticsearch_perfomance); + # SNMPTrapd monitoting + my $snmp_traps_monitoring = snmp_traps_monitoring($pa_config, $dbh); + $xml_output .= $snmp_traps_monitoring if defined($snmp_traps_monitoring); + + # Wux nobitoring + my $wux_performance = enterprise_hook("wux_performance", [$pa_config, $dbh]); + $xml_output .= $wux_performance if defined($wux_performance); $xml_output .= ""; @@ -8165,6 +8300,91 @@ sub exec_cluster_ap_module ($$$$) { pandora_update_agent ($pa_config, $timestamp, $module->{'id_agente'}, undef, undef, -1, $dbh); } + +################################################################################ +# SNMP Log Monitoring +################################################################################ +sub snmp_traps_monitoring ($$) { + my ($pa_config, $dbh) = @_; + + return undef unless $pa_config->{'snmpconsole'} == 1; + my $xml_output = ''; + + my $filename = $pa_config->{'snmp_logfile'}; + my $size = -s $filename; + my $size_in_mb; + + if(defined($size) && $size != 0) { + $size_in_mb = $size / (1024 * 1024); + } else { + $size_in_mb = 0; + } + + my @modules; + my $module; + + # SNMP Trap log size + $module->{'name'} = "SNMP Trap queue"; + $module->{'description'} = 'Size of snmp_logfile (MB): Size of snmp trap log in megabytes'; + $module->{'data'} = $size_in_mb; + $module->{'unit'} = 'MB'; + $module->{'min_critical'} = 1024; + $module->{'max_critical'} = 0; + push(@modules, $module); + undef $module; + + # Total traps + my $count = get_db_value($dbh, 'SELECT COUNT(id_trap) FROM ttrap'); + $count = 0 unless defined($count); + + $module->{'name'} = "total_traps"; + $module->{'description'} = 'Total number of traps'; + $module->{'data'} = $count; + $module->{'module_interval'} = 720; + push(@modules, $module); + undef $module; + + foreach my $module_data (@modules) { + $xml_output .=" "; + $xml_output .=" " .$module_data->{'name'}. ""; + $xml_output .=" " . $module_data->{'data'} . ""; + + if(defined($module_data->{'description'})) { + $xml_output .=" " .$module_data->{'description'}. ""; + } + if(defined($module_data->{'type'})) { + $xml_output .=" " .$module_data->{'type'}. ""; + } else { + $xml_output .=" generic_data"; + } + if(defined($module_data->{'unit'})) { + $xml_output .=" " .$module_data->{'unit'}. ""; + } + if(defined($module_data->{'module_parent'})) { + $xml_output .=" " .$module_data->{'module_parent'}. ""; + } + if(defined($module_data->{'module_interval'})) { + $xml_output .=" " .$module_data->{'module_interval'}. ""; + } + if(defined($module_data->{'max_critical'})) { + $xml_output .=" " .$module_data->{'max_critical'}. ""; + } + if(defined($module_data->{'min_critical'})) { + $xml_output .=" " .$module_data->{'min_critical'}. ""; + } + if(defined($module_data->{'max_warning'})) { + $xml_output .=" " .$module_data->{'max_warning'}. ""; + } + if(defined($module_data->{'min_warning'})) { + $xml_output .=" " .$module_data->{'min_warning'}. ""; + } + + $xml_output .=" "; + } + + return $xml_output; +} + # End of function declaration # End of defined Code From efb2a3a314d7ae9c132c53cec8a8d04b0ddead65 Mon Sep 17 00:00:00 2001 From: Calvo Date: Thu, 21 Sep 2023 15:53:13 +0200 Subject: [PATCH 6/6] Automonitorization --- pandora_server/lib/PandoraFMS/Core.pm | 84 ++++++++++++++++++--------- 1 file changed, 58 insertions(+), 26 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index e917626d58..f3115ad641 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -6421,7 +6421,6 @@ sub pandora_installation_monitoring($$) { $module->{'name'} = "total_agents"; $module->{'description'} = 'Total amount of agents'; $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(DISTINCT(id_agente)) FROM tagente'); - $module->{'module_group'} = 'Database'; push(@modules, $module); undef $module; @@ -6429,7 +6428,6 @@ sub pandora_installation_monitoring($$) { $module->{'name'} = "total_modules"; $module->{'description'} = 'Total modules'; $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(DISTINCT(id_agente_modulo)) FROM tagente_modulo'); - $module->{'module_group'} = 'Database'; push(@modules, $module); undef $module; @@ -6437,7 +6435,6 @@ sub pandora_installation_monitoring($$) { $module->{'name'} = "total_groups"; $module->{'description'} = 'Total groups'; $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(DISTINCT(id_grupo)) FROM tgrupo'); - $module->{'module_group'} = 'Database'; push(@modules, $module); undef $module; @@ -6445,8 +6442,7 @@ sub pandora_installation_monitoring($$) { $module->{'name'} = "total_data"; $module->{'description'} = 'Total module data records'; $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(id_agente_modulo) FROM tagente_datos'); - $module->{'module_interval'} = '86400'; - $module->{'module_group'} = 'Database'; + $module->{'module_interval'} = '288'; push(@modules, $module); undef $module; @@ -6454,8 +6450,7 @@ sub pandora_installation_monitoring($$) { $module->{'name'} = "total_string_data"; $module->{'description'} = 'Total module string data records'; $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(id_agente_modulo) FROM tagente_datos_string'); - $module->{'module_interval'} = '86400'; - $module->{'module_group'} = 'Database'; + $module->{'module_interval'} = '288'; push(@modules, $module); undef $module; @@ -6463,7 +6458,6 @@ sub pandora_installation_monitoring($$) { $module->{'name'} = "total_access_data"; $module->{'description'} = 'Total agent access records'; $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(id_agent) FROM tagent_access'); - $module->{'module_group'} = 'Database'; push(@modules, $module); undef $module; @@ -6471,15 +6465,13 @@ sub pandora_installation_monitoring($$) { $module->{'name'} = "total_users"; $module->{'description'} = 'Total users'; $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(id_user) FROM tusuario'); - $module->{'module_group'} = 'Database'; push(@modules, $module); undef $module; # Total sessions - $module->{'name'} = "total_users"; - $module->{'description'} = 'Total users'; + $module->{'name'} = "total_sessions"; + $module->{'description'} = 'Total sessions'; $module->{'data'} = get_db_value($dbh, 'SELECT COUNT(id_session) FROM tsessions_php'); - $module->{'module_group'} = 'Database'; push(@modules, $module); undef $module; @@ -6495,7 +6487,6 @@ sub pandora_installation_monitoring($$) { AND tagente_modulo.disabled = 0 AND estado = 3" ); - $module->{'module_group'} = 'Database'; push(@modules, $module); undef $module; @@ -6503,12 +6494,11 @@ sub pandora_installation_monitoring($$) { $module->{'name'} = "total_notinit"; $module->{'description'} = 'Total not init modules'; $module->{'data'} = get_db_value($dbh, "SELECT COUNT(DISTINCT(id_agente_modulo)) FROM tagente_estado WHERE estado = 4"); - $module->{'module_group'} = 'Database'; push(@modules, $module); undef $module; # Tables fragmentation - $module->{'name'} = "tables_fragmentation"; + $module->{'name'} = "table_fragmentation"; $module->{'description'} = 'Tables fragmentation'; $module->{'data'} = get_db_value( $dbh, @@ -6521,7 +6511,6 @@ sub pandora_installation_monitoring($$) { AND table_name NOT IN ('tagent_access, tevento')" ); $module->{'unit'} = '%'; - $module->{'module_group'} = 'Database'; push(@modules, $module); undef $module; @@ -6632,29 +6621,72 @@ sub pandora_installation_monitoring($$) { # Defined alerts my $total_alerts = get_db_value( $dbh, - 'SELECT - (SELECT COUNT(id) FROM talert_template_modules WHERE disabled = 0 AND standby = 0 AND disabled_by_downtime = 0) + - (SELECT COUNT(id) FROM tevent_alert WHERE disabled = 0 AND standby = 0) AS Total' - ); - $module->{'name'} = "defined_alers"; + 'SELECT COUNT(id) FROM talert_template_modules WHERE disabled = 0 AND standby = 0 AND disabled_by_downtime = 0' + ); + $module->{'name'} = "defined_alerts"; $module->{'description'} = 'Number of defined (and active) alerts'; $module->{'data'} = $total_alerts; push(@modules, $module); undef $module; - # Last 24 hours triggered alerts. + # Defined correlative alerts + my $total_correlative_alerts = get_db_value( + $dbh, + 'SELECT COUNT(id) FROM tevent_alert WHERE disabled = 0 AND standby = 0' + ); + $module->{'name'} = "defined_correlative_alerts"; + $module->{'description'} = 'Number of defined correlative alerts'; + $module->{'data'} = $total_alerts; + push(@modules, $module); + undef $module; + + # Alertas disparadas actualmente. my $triggered_alerts = get_db_value( + $dbh, + 'SELECT COUNT(id) FROM talert_template_modules WHERE times_fired != 0 AND disabled = 0 AND standby = 0 AND disabled_by_downtime = 0' + ); + $module->{'name'} = "triggered_alerts"; + $module->{'description'} = 'Number of active alerts'; + $module->{'data'} = $triggered_alerts; + push(@modules, $module); + undef $module; + + # Alertas correladivas activas + my $triggered_correlative_alerts = get_db_value( + $dbh, + 'SELECT COUNT(id) FROM tevent_alert WHERE times_fired != 0 AND disabled = 0 AND standby = 0' + ); + $module->{'name'} = "triggered_correlative_alerts"; + $module->{'description'} = 'Number of active correlative alerts'; + $module->{'data'} = $triggered_correlative_alerts; + push(@modules, $module); + undef $module; + + + # Last 24 hours triggered alerts. + my $triggered_alerts_24h = get_db_value( $dbh, 'SELECT COUNT(id) FROM talert_template_modules WHERE last_fired >=UNIX_TIMESTAMP(NOW() - INTERVAL 1 DAY)' ); - $module->{'name'} = "triggered_alerts"; + $module->{'name'} = "triggered_alerts_24h"; $module->{'description'} = 'Last 24h triggered alerts'; - $module->{'data'} = $triggered_alerts; + $module->{'data'} = $triggered_alerts_24h; push(@modules, $module); undef $module; + my $triggered_correlative_alerts_24h = get_db_value( + $dbh, + 'SELECT COUNT(id) + FROM tevent_alert + WHERE last_fired >=UNIX_TIMESTAMP(NOW() - INTERVAL 1 DAY)' + ); + $module->{'name'} = "triggered_correlative_alerts_24h"; + $module->{'description'} = 'Last 24h triggered correlative alerts'; + $module->{'data'} = $triggered_correlative_alerts_24h; + push(@modules, $module); + undef $module; } @@ -8324,7 +8356,7 @@ sub snmp_traps_monitoring ($$) { my $module; # SNMP Trap log size - $module->{'name'} = "SNMP Trap queue"; + $module->{'name'} = "snmp_trap_queue"; $module->{'description'} = 'Size of snmp_logfile (MB): Size of snmp trap log in megabytes'; $module->{'data'} = $size_in_mb; $module->{'unit'} = 'MB'; @@ -8340,7 +8372,7 @@ sub snmp_traps_monitoring ($$) { $module->{'name'} = "total_traps"; $module->{'description'} = 'Total number of traps'; $module->{'data'} = $count; - $module->{'module_interval'} = 720; + $module->{'module_interval'} = 288; push(@modules, $module); undef $module;