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

2009-01-08 Ramon Novoa <rnovoa@artica.es> 

* include/functions.php,
          pandoradb.sql,
          operation/agentes/estado_alertas.php,
          operation/agentes/estado_monitores.php,
          operation/agentes/ver_agente.php: Added support for forced alert
          execution.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1322 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2009-01-08 11:53:14 +00:00
parent d95cc86e82
commit 80e6fb75f1
6 changed files with 64 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2009-01-08 Ramon Novoa <rnovoa@artica.es>
* include/functions.php,
pandoradb.sql,
operation/agentes/estado_alertas.php,
operation/agentes/estado_monitores.php,
operation/agentes/ver_agente.php: Added support for forced alert
execution.
2009-01-07 Evi Vanoost <vanooste@rcbi.rochester.edu>
* include/functions.php: Removed safe_sql_string. Cleaned documenation so

48
pandora_console/include/functions.php
View File

@ -804,41 +804,57 @@ function show_alert_row_edit ($row2, $tdcolor = "datos", $id_tipo_modulo = 1, $c
* @param (array) $alert A valid (non empty) row from the alert table
* @param (bool) $combined Whether or not this is a combined alert
* @param (bool) $agent Whether to print the agent information with the module information
* @param $section (string) Tab where the function was called from (used for urls)
*
* @return (array) A formatted array with proper html for use in $table -> 7 columns
*/
function format_alert_row ($alert, $combined = 0, $agent = 1) {
function format_alert_row ($alert, $combined = 0, $agent = 1, $tab = 'main') {
if (empty ($alert)) {
return array ("", "", "", "", "", "", "");
}
// Get agent id
$id_agente = get_agentmodule_agent($alert["id_agente_modulo"]);
$data = array ();
$data[0] = get_alert_type ($alert["id_alerta"]);
// Force alert execution
if ($combined == 0) {
if ($alert["flag"] == 0) {
$data[0] = "<a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$id_agente."&id_agente_modulo=".$alert["id_agente_modulo"]."&tab=".$tab."&flag_alert=1&refr=60'><img src='images/target.png' border='0'></a>";
} else {
$data[0] = "<a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$id_agente."&tab=".$tab."&refr=60'><img src='images/refresh.png' border='0'></a>";
}
} else {
$data[0] = '';
}
$data[1] = get_alert_type ($alert["id_alerta"]);
if ($combined == 1) {
$data[1] = print_agent_name ($alert["id_agente"], true, 20);
$data[2] = print_agent_name ($id_agente, true, 20);
} elseif ($agent == 0) {
$data[1] = mb_substr (get_agentmodule_name ($alert["id_agente_modulo"]), 0, 20);
$data[2] = mb_substr (get_agentmodule_name ($alert["id_agente_modulo"]), 0, 20);
} else {
$data[1] = print_agent_name (get_agentmodule_agent ($alert["id_agente_modulo"]), true, 20);
$data[2] = print_agent_name (get_agentmodule_agent ($alert["id_agente_modulo"]), true, 20);
}
$data[2] = mb_substr (safe_input ($alert["descripcion"]), 0, 35);
$data[3] = mb_substr (safe_input ($alert["descripcion"]), 0, 35);
//Eye tooltip
$data[3] = '<a class="info"><img class="top" src="images/eye.png" alt="detail tooltip" />';
$data[3] .= '<span><table cellspacing="2" cellpadding="0" style="margin-left:2px;">
$data[4] = '<a class="info"><img class="top" src="images/eye.png" alt="detail tooltip" />';
$data[4] .= '<span><table cellspacing="2" cellpadding="0" style="margin-left:2px;">
<tr><th colspan="2" width="91">'.__('Recovery').'</th></tr>
<tr><td colspan="2" class="datos" align="center"><b>'.($alert["recovery_notify"] == 1 ? __('Yes') : __('No')).'</b></td></tr>
<tr><th colspan="2" width="91">'.__('Priority').'</th></tr>
<tr><td colspan="2" class="datos" align="center"><b>'.get_alert_priority ($alert["priority"]).'</b></td></tr>
<tr><th colspan="2" width="91">'.__('Fires every').'</th></tr><tr><td colspan="2" class="datos" align="center"><b>';
if ($alert["min_alerts"] > 0) {
$data[3] .= human_time_description_raw ($alert["time_threshold"] / $alert["min_alerts"]);
$data[4] .= human_time_description_raw ($alert["time_threshold"] / $alert["min_alerts"]);
} else {
$data[3] .= human_time_description_raw ($alert["time_threshold"]);
$data[4] .= human_time_description_raw ($alert["time_threshold"]);
}
$data[3] .= '</b></td></tr>
$data[4] .= '</b></td></tr>
<tr><th colspan="2" width="91">'.__('Firing days').'</th></tr>
<tr><td colspan="2" class="datos" align="center"><b>'.get_alert_days ($alert).'</b></td></tr>
<tr><th colspan="2" width="91">'.__('Firing times').'</th></tr>
@ -846,9 +862,9 @@ function format_alert_row ($alert, $combined = 0, $agent = 1) {
</table></span></a>';
//Min. and Max. - maybe move this to the span
$data[4] = format_numeric ($alert["dis_min"], 2).' / '.format_numeric ($alert["dis_max"], 2);
$data[5] = format_numeric ($alert["dis_min"], 2).' / '.format_numeric ($alert["dis_max"], 2);
$data[5] = print_timestamp ($alert["last_fired"], true);
$data[6] = print_timestamp ($alert["last_fired"], true);
$options = array ();
$options["height"] = 9;
@ -864,9 +880,9 @@ function format_alert_row ($alert, $combined = 0, $agent = 1) {
$options["src"] = "images/pixel_green.png";
$options["title"] = __('Alert not fired');
}
$data[6] = print_image ($options["src"], true, $options);
$data[7] = print_image ($options["src"], true, $options);
$data[7] = print_checkbox ("validate[]", $alert["id_aam"], false, true);
$data[8] = print_checkbox ("validate[]", $alert["id_aam"], false, true);
return $data;
}

26
pandora_console/operation/agentes/estado_alertas.php
View File

@ -115,27 +115,29 @@ $table->class = "databox";
$table->head = array ();
$table->head[0] = __('Type');
$table->head[1] = ''; //Placeholder for name
$table->head[2] = __('Description');
$table->head[3] = __('Info');
$table->head[4] = __('Min').'/'.__('Max');
$table->head[5] = __('Last fired');
$table->head[6] = __('Status');
$table->head[7] = __('Validate') . pandora_help('alert_validation', true);
$table->head[0] = '';
$table->head[1] = __('Type');
$table->head[2] = ''; //Placeholder for name
$table->head[3] = __('Description');
$table->head[4] = __('Info');
$table->head[5] = __('Min').'/'.__('Max');
$table->head[6] = __('Last fired');
$table->head[7] = __('Status');
$table->head[8] = __('Validate') . pandora_help('alert_validation', true);
$table->align = array ();
$table->align[0] = "center";
$table->align[3] = "center";
$table->align[1] = "center";
$table->align[4] = "center";
$table->align[5] = "center";
$table->align[6] = "center";
$table->align[7] = "center";
$table->align[8] = "center";
$table->title = __('Single alerts');
if ($print_agent == 0) {
$table->head[1] = __('Module name');
$table->head[2] = __('Module name');
} else {
$table->head[1] = __('Agent name');
$table->head[2] = __('Agent name');
}
$table->data = array ();
@ -148,7 +150,7 @@ foreach ($alerts_simple as $alert) {
continue;
}
$counter[1]++;
array_push ($table->data, format_alert_row ($alert, 0, $print_agent));
array_push ($table->data, format_alert_row ($alert, 0, $print_agent, 'alert'));
}
if (!empty ($table->data)) {

2
pandora_console/operation/agentes/estado_monitores.php
View File

@ -45,7 +45,7 @@ $table->class = "databox";
$table->head = array ();
$table->data = array ();
$table->head[0] = "X";
$table->head[0] = '';
$table->head[1] = __('Type');
$table->head[2] = __('Module name');
$table->head[3] = __('Description');

7
pandora_console/operation/agentes/ver_agente.php
View File

@ -161,6 +161,13 @@ if (isset($_GET["flag_agent"])){
process_sql ($sql);
}
}
// Force alert execution
$flag_alert = (int) get_parameter ('flag_alert', 0);
$id_agente_modulo = (int) get_parameter ('id_agente_modulo', 0);
if ($flag_alert == 1 && give_acl ($config['id_user'], $id_grupo, "AW")) {
$sql = "UPDATE talerta_agente_modulo SET flag = 1 WHERE id_agente_modulo = " . $id_agente_modulo;
process_sql ($sql);
}
echo "<div id='menu_tab_frame_view'>";
echo "<div id='menu_tab_left'><ul class='mn'><li class='view'>

1
pandora_console/pandoradb.sql
View File

@ -247,6 +247,7 @@ CREATE TABLE `talerta_agente_modulo` (
`priority` tinyint(4) default '0',
`al_f2_recovery` varchar(255) NOT NULL default '',
`al_f3_recovery` mediumtext NOT NULL,
`flag` tinyint(1) unsigned default '0',
PRIMARY KEY (`id_aam`),
KEY `id_agente_modulo` (`id_agente_modulo`),
KEY `disable` (`disable`)