tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-9670-mejoras-automonitorizacion' into 'develop' 

Automonitorization in one agent pandora.internals

See merge request artica/pandorafms!6527
This commit is contained in:
Diego Muñoz-Reja 2023-10-09 12:48:12 +00:00
parent 64a17cb59d 5a985aabac
commit 116702e2b3
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -6249,7 +6249,7 @@ sub pandora_self_monitoring ($$) {
my $xml_output = ""; my $xml_output = "";
$xml_output = "<agent_data os_name='$OS' os_version='$OS_VERSION' version='" . $pa_config->{'version'} . "' description='" . $pa_config->{'rb_product_name'} . " Server version " . $pa_config->{'version'} . "' agent_name='".$pa_config->{'servername'} . "' agent_alias='".$pa_config->{'servername'} . "' interval='".$pa_config->{"self_monitoring_interval"}."' timestamp='".$timestamp."' >"; $xml_output = "<agent_data os_name='$OS' os_version='$OS_VERSION' version='" . $pa_config->{'version'} . "' description='" . $pa_config->{'rb_product_name'} . " Server version " . $pa_config->{'version'} . "' agent_name='pandora.internals' agent_alias='pandora.internals' interval='".$pa_config->{"self_monitoring_interval"}."' timestamp='".$timestamp."' >";
$xml_output .=" <module>"; $xml_output .=" <module>";
$xml_output .=" <name>Status</name>"; $xml_output .=" <name>Status</name>";
$xml_output .=" <type>generic_proc</type>"; $xml_output .=" <type>generic_proc</type>";
@ -6311,8 +6311,7 @@ sub pandora_self_monitoring ($$) {
$pandoradb = 1; $pandoradb = 1;
} }
my $num_threads = 0; my $num_threads = get_db_value ($dbh, 'SELECT SUM(threads) FROM tserver WHERE name = "'.$pa_config->{"servername"}.'"');
$num_threads = get_db_value ($dbh, "SELECT SUM(threads) FROM tserver WHERE name = '".$pa_config->{"servername"}."'");
my $cpu_load = 0; my $cpu_load = 0;
$cpu_load = cpu_load(); $cpu_load = cpu_load();
@ -6405,11 +6404,14 @@ sub pandora_self_monitoring ($$) {
$xml_output .=" </module>"; $xml_output .=" </module>";
} }
$xml_output .=" <module>"; if(defined($num_threads)) {
$xml_output .=" <name>Total Threads</name>"; $xml_output .=" <module>";
$xml_output .=" <type>generic_data</type>"; $xml_output .=" <name>Total Threads</name>";
$xml_output .=" <data>$num_threads</data>"; $xml_output .=" <type>generic_data</type>";
$xml_output .=" </module>"; $xml_output .=" <data>$num_threads</data>";
$xml_output .=" </module>";
}
$xml_output .=" <module>"; $xml_output .=" <module>";
$xml_output .=" <name>CPU Load</name>"; $xml_output .=" <name>CPU Load</name>";
@ -6441,11 +6443,12 @@ sub pandora_self_monitoring ($$) {
$xml_output .=" </module>"; $xml_output .=" </module>";
} }
# Installation monitoring.
$xml_output .= pandora_installation_monitoring($pa_config, $dbh);
$xml_output .= "</agent_data>"; $xml_output .= "</agent_data>";
my $filename = $pa_config->{"incomingdir"}."/".$pa_config->{'servername'}.".self.".$utimestamp.".data"; my $filename = $pa_config->{"incomingdir"}."/pandora.internals.self".$utimestamp.".data";
open (XMLFILE, ">", $filename) or die "[FATAL] Could not open internal monitoring XML file for deploying monitorization at '$filename'"; open (XMLFILE, ">", $filename) or die "[FATAL] Could not open internal monitoring XML file for deploying monitorization at '$filename'";
print XMLFILE $xml_output; print XMLFILE $xml_output;
close (XMLFILE); close (XMLFILE);
@ -6470,7 +6473,7 @@ sub pandora_thread_monitoring ($$$) {
# All trhead modules are "Status" module sons. # All trhead modules are "Status" module sons.
$module_parent = 'Status'; $module_parent = 'Status';
$xml_output = "<agent_data os_name='$OS' os_version='$OS_VERSION' version='" . $pa_config->{'version'} . "' description='" . $pa_config->{'rb_product_name'} . " Server version " . $pa_config->{'version'} . "' agent_name='".$pa_config->{'servername'} . "' agent_alias='".$pa_config->{'servername'} . "' interval='".$pa_config->{"self_monitoring_interval"}."' timestamp='".$timestamp."' >"; $xml_output = "<agent_data os_name='$OS' os_version='$OS_VERSION' version='" . $pa_config->{'version'} . "' description='" . $pa_config->{'rb_product_name'} . " Server version " . $pa_config->{'version'} . "' agent_name='pandora.internals' agent_alias='pandora.internals' interval='".$pa_config->{"self_monitoring_interval"}."' timestamp='".$timestamp."' >";
foreach my $server (@{$servers}) { foreach my $server (@{$servers}) {
my $producer_stats = $server->getProducerStats(); my $producer_stats = $server->getProducerStats();
while (my ($tid, $stats) = each(%{$producer_stats})) { while (my ($tid, $stats) = each(%{$producer_stats})) {
@ -6536,7 +6539,7 @@ sub pandora_thread_monitoring ($$$) {
} }
$xml_output .= "</agent_data>"; $xml_output .= "</agent_data>";
my $filename = $pa_config->{"incomingdir"}."/".$pa_config->{'servername'}.".threads.".$utimestamp.".data"; my $filename = $pa_config->{"incomingdir"}."/pandora.internals.threads.".$utimestamp.".data";
open (XMLFILE, ">", $filename) or die "[FATAL] Could not write to the thread monitoring XML file '$filename'"; open (XMLFILE, ">", $filename) or die "[FATAL] Could not write to the thread monitoring XML file '$filename'";
print XMLFILE $xml_output; print XMLFILE $xml_output;
close (XMLFILE); close (XMLFILE);
@ -6557,7 +6560,6 @@ sub pandora_installation_monitoring($$) {
my @modules; my @modules;
my $xml_output = ""; my $xml_output = "";
$xml_output = "<agent_data os_name='$OS' os_version='$OS_VERSION' version='" . $pa_config->{'version'} . "' description='" . $pa_config->{'rb_product_name'} . " Server version " . $pa_config->{'version'} . "' agent_name='pandora.internals' agent_alias='pandora.internals' interval='".$pa_config->{"self_monitoring_interval"}."' timestamp='".$timestamp."' >";
# Total amount of agents # Total amount of agents
my $module; my $module;
@ -6597,13 +6599,6 @@ sub pandora_installation_monitoring($$) {
push(@modules, $module); push(@modules, $module);
undef $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(id_agent) FROM tagent_access');
push(@modules, $module);
undef $module;
# Total users # Total users
$module->{'name'} = "total_users"; $module->{'name'} = "total_users";
$module->{'description'} = 'Total users'; $module->{'description'} = 'Total users';
@ -6831,6 +6826,20 @@ sub pandora_installation_monitoring($$) {
push(@modules, $module); push(@modules, $module);
undef $module; undef $module;
# Last 24Events.
my $events_24 = get_db_value(
$dbh,
'SELECT COUNT(id_evento)
FROM tevento
WHERE timestamp >=UNIX_TIMESTAMP(NOW() - INTERVAL 1 DAY)'
);
$module->{'name'} = "last_events_24h";
$module->{'description'} = 'Last 24h events';
$module->{'data'} = $events_24;
$module->{'module_interval'} = '288';
push(@modules, $module);
undef $module;
} }
foreach my $module_data (@modules) { foreach my $module_data (@modules) {
@ -6886,12 +6895,7 @@ sub pandora_installation_monitoring($$) {
my $wux_performance = enterprise_hook("wux_performance", [$pa_config, $dbh]); my $wux_performance = enterprise_hook("wux_performance", [$pa_config, $dbh]);
$xml_output .= $wux_performance if defined($wux_performance); $xml_output .= $wux_performance if defined($wux_performance);
$xml_output .= "</agent_data>"; return $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);
} }
########################################################################## ##########################################################################