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

Merge branch 'ent-4338-No_funcionan_las_alertas_sonoras' into 'develop'

Browse Source 
fixed events sound

See merge request artica/pandorafms!2603
This commit is contained in:
Daniel Rodriguez 2019-07-16 11:57:59 +02:00
commit c80561f595
2 changed files with 124 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
pandora_console/include/ajax/events.php
View File

@ -83,6 +83,7 @@ $validate_event = get_parameter('validate_event', 0);
$delete_event = get_parameter('delete_event', 0); $delete_event = get_parameter('delete_event', 0);
$get_event_filters = get_parameter('get_event_filters', 0); $get_event_filters = get_parameter('get_event_filters', 0);
$get_comments = get_parameter('get_comments', 0); $get_comments = get_parameter('get_comments', 0);
$get_events_fired = (bool) get_parameter('get_events_fired');
if ($get_comments) { if ($get_comments) {
$event = get_parameter('event', false); $event = get_parameter('event', false);
@ -1695,3 +1696,118 @@ if ($get_table_response_command) {
return; return;
} }
if ($get_events_fired) {
$id = get_parameter('id_row');
$idGroup = get_parameter('id_group');
$agents = get_parameter('agents', null);
$query = ' AND id_evento > '.$id;
$type = [];
$alert = get_parameter('alert_fired');
if ($alert == 'true') {
$resultAlert = alerts_get_event_status_group(
$idGroup,
[
'alert_fired',
'alert_ceased',
],
$query,
$agents
);
}
$critical = get_parameter('critical');
if ($critical == 'true') {
$resultCritical = alerts_get_event_status_group(
$idGroup,
'going_up_critical',
$query,
$agents
);
}
$warning = get_parameter('warning');
if ($warning == 'true') {
$resultWarning = alerts_get_event_status_group(
$idGroup,
'going_up_warning',
$query,
$agents
);
}
$unknown = get_parameter('unknown');
if ($unknown == 'true') {
$resultUnknown = alerts_get_event_status_group(
$idGroup,
'going_unknown',
$query,
$agents
);
}
if ($resultAlert) {
$return = [
'fired' => $resultAlert,
'sound' => $config['sound_alert'],
];
$event = events_get_event($resultAlert);
$module_name = modules_get_agentmodule_name($event['id_agentmodule']);
$agent_name = agents_get_alias($event['id_agente']);
$return['message'] = io_safe_output($agent_name).' - ';
$return['message'] .= __('Alert fired in module ');
$return['message'] .= io_safe_output($module_name).' - ';
$return['message'] .= $event['timestamp'];
} else if ($resultCritical) {
$return = [
'fired' => $resultCritical,
'sound' => $config['sound_critical'],
];
$event = events_get_event($resultCritical);
$module_name = modules_get_agentmodule_name($event['id_agentmodule']);
$agent_name = agents_get_alias($event['id_agente']);
$return['message'] = io_safe_output($agent_name).' - ';
$return['message'] .= __('Module ').io_safe_output($module_name);
$return['message'] .= __(' is going to critical').' - ';
$return['message'] .= $event['timestamp'];
} else if ($resultWarning) {
$return = [
'fired' => $resultWarning,
'sound' => $config['sound_warning'],
];
$event = events_get_event($resultWarning);
$module_name = modules_get_agentmodule_name($event['id_agentmodule']);
$agent_name = agents_get_alias($event['id_agente']);
$return['message'] = io_safe_output($agent_name).' - ';
$return['message'] .= __('Module ').io_safe_output($module_name);
$return['message'] .= __(' is going to warning').' - ';
$return['message'] .= $event['timestamp'];
} else if ($resultUnknown) {
$return = [
'fired' => $resultUnknown,
'sound' => $config['sound_alert'],
];
$event = events_get_event($resultUnknown);
$module_name = modules_get_agentmodule_name($event['id_agentmodule']);
$agent_name = agents_get_alias($event['id_agente']);
$return['message'] = io_safe_output($agent_name).' - ';
$return['message'] .= __('Module ').io_safe_output($module_name);
$return['message'] .= __(' is going to unknown').' - ';
$return['message'] .= $event['timestamp'];
} else {
$return = ['fired' => 0];
}
echo io_json_mb_encode($return);
}

18
pandora_console/operation/events/sound_events.php
View File

@ -59,7 +59,7 @@ echo '</head>';
echo "<body style='background-color: #494949; max-width: 550px; max-height: 400px; margin-top:40px;'>"; echo "<body style='background-color: #494949; max-width: 550px; max-height: 400px; margin-top:40px;'>";
echo "<h1 class='modalheaderh1'>".__('Sound console').'</h1>'; echo "<h1 class='modalheaderh1'>".__('Sound console').'</h1>';
$table = null; $table = new StdClass;
$table->width = '100%'; $table->width = '100%';
$table->styleTable = 'padding-left:16px; padding-right:16px; padding-top:16px;'; $table->styleTable = 'padding-left:16px; padding-right:16px; padding-top:16px;';
$table->class = ' '; $table->class = ' ';
@ -82,7 +82,7 @@ $table->data[1][3] = html_print_textarea('events_fired', 200, 20, '', 'readonly=
html_print_table($table); html_print_table($table);
$table = null; $table = new StdClass;
$table->width = '100%'; $table->width = '100%';
$table->rowstyle[0] = 'text-align:center;'; $table->rowstyle[0] = 'text-align:center;';
$table->styleTable = 'padding-top:16px;padding-bottom:16px;'; $table->styleTable = 'padding-top:16px;padding-bottom:16px;';
@ -196,15 +196,15 @@ function forgetPreviousEvents() {
var agents = $("#id_agents").val(); var agents = $("#id_agents").val();
jQuery.post ("../../ajax.php", jQuery.post ("../../ajax.php",
{"page" : "operation/events/events", {"page" : "include/ajax/events",
"get_events_fired": 1, "get_events_fired": 1,
"id_group": group, "id_group": group,
"agents[]" : agents,
"alert_fired": alert_fired, "alert_fired": alert_fired,
"critical": critical, "critical": critical,
"warning": warning, "warning": warning,
"unknown": unknown, "unknown": unknown,
"id_row": id_row "id_row": id_row,
"agents[]" : agents
}, },
function (data) { function (data) {
firedId = parseInt(data['fired']); firedId = parseInt(data['fired']);
@ -219,18 +219,17 @@ function forgetPreviousEvents() {
function check_event() { function check_event() {
var agents = $("#id_agents").val(); var agents = $("#id_agents").val();
if (running) { if (running) {
jQuery.post ("../../ajax.php", jQuery.post ("../../ajax.php",
{"page" : "operation/events/events", {"page" : "include/ajax/events",
"get_events_fired": 1, "get_events_fired": 1,
"id_group": group, "id_group": group,
"agents[]" : agents,
"alert_fired": alert_fired, "alert_fired": alert_fired,
"critical": critical, "critical": critical,
"warning": warning, "warning": warning,
"unknown": unknown, "unknown": unknown,
"id_row": id_row "id_row": id_row,
"agents[]" : agents,
}, },
function (data) { function (data) {
firedId = parseInt(data['fired']); firedId = parseInt(data['fired']);
@ -247,7 +246,6 @@ function check_event() {
$('audio').remove(); $('audio').remove();
$('body').append("<audio src='../../" + data['sound'] + "' autoplay='true' hidden='true' loop='true'>"); $('body').append("<audio src='../../" + data['sound'] + "' autoplay='true' hidden='true' loop='true'>");
} }
}, },
"json" "json"
); );