tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

wip reports alert actions

Browse Source
This commit is contained in:
Daniel Barbero Martin 2021-12-02 13:34:28 +01:00
parent b781215b4e
commit 9b79fb826d
3 changed files with 48 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -187,11 +187,13 @@ $graph_render = (empty($config['type_mode_graph']) === true) ? 0 : $config['type
$valuesGroupBy = [0 => __('None')]; $valuesGroupBy = [0 => __('None')];
$valuesGroupByDefaultAlertActions = [ $valuesGroupByDefaultAlertActions = [
'agent' => __('Agent'), 'agent' => __('Agent'),
'module' => __('Module'), 'module' => __('Module'),
'group' => __('Group'), 'group' => __('Group'),
'template' => __('Template'),
]; ];
if (is_metaconsole() === false) {
$valuesGroupByDefaultAlertActions['template'] = __('Template');
}
switch ($action) { switch ($action) {
case 'new': case 'new':
@ -789,16 +791,21 @@ switch ($action) {
$group_by = $es['group_by']; $group_by = $es['group_by'];
$valuesGroupBy = [
'agent' => __('Agent'),
'module' => __('Module'),
'group' => __('Group'),
'template' => __('Template'),
];
$period = $item['period']; $period = $item['period'];
$lapse = $item['lapse']; $lapse = $item['lapse'];
// Set values.
$valuesGroupBy = [
'agent' => __('Agent'),
'module' => __('Module'),
'group' => __('Group'),
];
if (is_metaconsole() === false) {
$valuesGroupBy['template'] = __('Template');
}
$lapse_calc = 1; $lapse_calc = 1;
break; break;
@ -5695,6 +5702,7 @@ function addGeneralRow() {
} }
function chooseType() { function chooseType() {
var meta = '<?php echo (is_metaconsole() === true) ? 1 : 0; ?>';
type = $("#type").val(); type = $("#type").val();
$("#row_description").hide(); $("#row_description").hide();
$("#row_label").hide(); $("#row_label").hide();
@ -6116,7 +6124,9 @@ function chooseType() {
$("#select_agent_modules").show(); $("#select_agent_modules").show();
$("#agents_modules_row").show(); $("#agents_modules_row").show();
$("#modules_row").show(); $("#modules_row").show();
$("#row_alert_templates").show(); if(meta == 0){
$("#row_alert_templates").show();
}
$("#row_alert_actions").show(); $("#row_alert_actions").show();
$("#row_period").show(); $("#row_period").show();
$("#row_lapse").show(); $("#row_lapse").show();
@ -6133,7 +6143,8 @@ function chooseType() {
}); });
$("#lapse_select").attr('disabled', false); $("#lapse_select").attr('disabled', false);
$("#lapse_select").val(0).trigger('change'); $("#lapse_select").val('0').trigger('change');
$("#hidden-lapse").val('0');
} }
break; break;

33
pandora_console/include/functions_reporting.php
View File

@ -2688,11 +2688,30 @@ function reporting_alert_report_actions($report, $content)
$return['data'] = []; $return['data'] = [];
$es = json_decode($content['external_source'], true); $es = json_decode($content['external_source'], true);
if (isset($report['id_template']) === true
&& empty($resport['id_template']) === false
) {
$modules = json_decode(
io_safe_output(base64_decode($es['module'])),
true
);
$agents = json_decode(
io_safe_output(base64_decode($es['id_agents'])),
true
);
} else {
if (is_metaconsole() === true) {
$server_id = metaconsole_get_id_server($content['server_name']);
$modules = [$server_id.'|'.$content['id_agent_module']];
$agents = [$server_id.'|'.$content['id_agent']];
} else {
$modules = [$content['id_agent_module']];
$agents = [$content['id_agent']];
}
}
$period = $content['period']; $period = $content['period'];
$id_group = $content['id_group']; $id_group = $content['id_group'];
$modules = $es['module'];
$agents = $es['id_agents'];
$templates = $es['templates']; $templates = $es['templates'];
$actions = $es['actions']; $actions = $es['actions'];
$show_summary = $es['show_summary']; $show_summary = $es['show_summary'];
@ -2701,14 +2720,8 @@ function reporting_alert_report_actions($report, $content)
$filters = [ $filters = [
'group' => $id_group, 'group' => $id_group,
'agents' => json_decode( 'agents' => $agents,
io_safe_output(base64_decode($agents)), 'modules' => $modules,
true
),
'modules' => json_decode(
io_safe_output(base64_decode($modules)),
true
),
'templates' => $templates, 'templates' => $templates,
'actions' => $actions, 'actions' => $actions,
'period' => $period, 'period' => $period,

2
pandora_console/include/functions_ui.php
View File

@ -329,7 +329,7 @@ function ui_print_message($message, $class='', $attributes='', $return=false, $t
if (!$no_close_bool) { if (!$no_close_bool) {
// Use the no_meta parameter because this image is only in // Use the no_meta parameter because this image is only in
// the base console. // the base console.
$output .= '<a href="javascript: close_info_box(\''.$id.'\')">'.html_print_image('images/blade.png', true, false, false, true).'</a>'; $output .= '<a href="javascript: close_info_box(\''.$id.'\')">'.html_print_image('images/blade.png', true, false, false, false).'</a>';
} }
$output .= '</td> $output .= '</td>