Merge branch 'ent-11414-bug-al-usar-mas-de-una-macro-de-modulegraph-con-el-mismo-numero-de-horas-en-alertado' into 'develop'

Add module to graph hash

Closes pandora_enterprise#11414

See merge request 
This commit is contained in:
Daniel Rodriguez 2023-08-18 07:19:34 +00:00
commit 9952fb64a0
1 changed files with 4 additions and 4 deletions
pandora_server/lib/PandoraFMS

View File

@ -1587,11 +1587,11 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
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';
$cid = 'module_graph_' . $hours . 'h'; $cid = 'module_graph_' . (defined($module) && $module ne '' ? ($module . '_') : '') . $hours . 'h';
} }
else{ else{
$params->{"other"} = $period . '%7C1%7C1%7C225%7C%7C14'; $params->{"other"} = $period . '%7C1%7C1%7C225%7C%7C14';
$cid = 'module_graphth_' . $hours . 'h'; $cid = 'module_graphth_' . (defined($module) && $module ne '' ? ($module . '_') : '') . $hours . 'h';
} }
if (defined($module)) { if (defined($module)) {