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

new alert macro

This commit is contained in:
alejandro.campos@artica.es 2023-04-03 16:59:10 +02:00
parent 061c9f8750
commit 0c1ec8095e
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1521,8 +1521,9 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
# Check for _module_graph_Xh_ macros # Check for _module_graph_Xh_ macros
# Check for _module_graph_Xh_ macros and _module_graphth_Xh_ # Check for _module_graph_Xh_ macros and _module_graphth_Xh_
my $module_graph_list = {}; my $module_graph_list = {};
my $macro_regexp = "_modulegraph_(\\d+)h_"; my $macro_regexp = "_modulegraph_(?!([\\w\\s-]+_\\d+h_))(\\d+)h_";
my $macro_regexp2 = "_modulegraphth_(\\d+)h_"; my $macro_regexp2 = "_modulegraphth_(\\d+)h_";
my $macro_regexp3 = "_modulegraph_([\\w\\s-]+)_(\\d+)h_";
# API connection # API connection
my $ua = new LWP::UserAgent; my $ua = new LWP::UserAgent;
@ -1548,6 +1549,7 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
my $subst_func = sub { my $subst_func = sub {
my $hours = shift; my $hours = shift;
my $threshold = shift; my $threshold = shift;
my $module = shift if @_;
my $period = $hours * 3600; # Hours to seconds my $period = $hours * 3600; # Hours to seconds
if($threshold == 0){ if($threshold == 0){
$params->{"other"} = $period . '%7C1%7C0%7C225%7C%7C14'; $params->{"other"} = $period . '%7C1%7C0%7C225%7C%7C14';
@ -1558,7 +1560,9 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
$cid = 'module_graphth_' . $hours . 'h'; $cid = 'module_graphth_' . $hours . 'h';
} }
$params->{"other_mode"} = 'url_encode_separator_%7C'; if (defined($module)) {
$params->{"id"} = get_agent_module_id($dbh, $module, $agent->{'id_agente'});
}
if (! exists($module_graph_list->{$cid}) && defined $url) { if (! exists($module_graph_list->{$cid}) && defined $url) {
# Get the module graph image in base 64 # Get the module graph image in base 64
@ -1578,8 +1582,9 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
eval { eval {
no warnings; no warnings;
local $SIG{__DIE__}; local $SIG{__DIE__};
$field3 =~ s/$macro_regexp/$subst_func->($1, 0)/ige; $field3 =~ s/$macro_regexp/$subst_func->($2, 0)/ige;
$field3 =~ s/$macro_regexp2/$subst_func->($1, 1)/ige; $field3 =~ s/$macro_regexp2/$subst_func->($1, 1)/ige;
$field3 =~ s/$macro_regexp3/$subst_func->($2, 0, $1)/ige;
}; };
# Default content type # Default content type