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

2014-08-26 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/alerts/configure_alert_action.php,
	include/help/clippy/godmode_agentes_modificar_agente.php,
	include/help/clippy/homepage.php,
	include/help/clippy/module_unknow.php,
	include/help/clippy/godmode_agentes_configurar_agente.php,
	include/help/clippy/godmode_alerts_alert_actions.php,
	include/help/clippy/operation_agentes_ver_agente.php,
	include/help/clippy/godmode_alerts_configure_alert_action.php,
	include/help/clippy/operation_agentes_status_monitor.php,
	include/help/en/help_context_pandora_server_email.php,
	include/functions_clippy.php, operation/menu.php,
	operation/agentes/status_monitor.php: some changes suggested by
	Carla.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10457 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2014-08-26 11:22:06 +00:00
parent 1bc3f0f98e
commit 66a9c59ddb
14 changed files with 472 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pandora_console/ChangeLog
View File

@ -1,3 +1,19 @@
2014-08-26 Miguel de Dios <miguel.dedios@artica.es>
* godmode/alerts/configure_alert_action.php,
include/help/clippy/godmode_agentes_modificar_agente.php,
include/help/clippy/homepage.php,
include/help/clippy/module_unknow.php,
include/help/clippy/godmode_agentes_configurar_agente.php,
include/help/clippy/godmode_alerts_alert_actions.php,
include/help/clippy/operation_agentes_ver_agente.php,
include/help/clippy/godmode_alerts_configure_alert_action.php,
include/help/clippy/operation_agentes_status_monitor.php,
include/help/en/help_context_pandora_server_email.php,
include/functions_clippy.php, operation/menu.php,
operation/agentes/status_monitor.php: some changes suggested by
Carla.
2014-08-25 Vanessa Gil <vanessa.gil@artica.es>
* godmode/setup/setup_general.php: Improved timezone

39
pandora_console/godmode/alerts/configure_alert_action.php
View File

@ -136,16 +136,35 @@ $table->data[5][2] = html_print_textarea ('command_recovery_preview', 5, 30, '',
$row = 6;
for ($i = 1; $i <= 10; $i++) {
$table->data['field'.$i][0] = html_print_image('images/spinner.gif',true);
$table->data['field'.$i][1] = html_print_image('images/spinner.gif',true);
$table->data['field'.$i][2] = html_print_image('images/spinner.gif',true);
$table->data['field' . $i][0] = html_print_image('images/spinner.gif', true);
$table->data['field' . $i][1] = html_print_image('images/spinner.gif', true);
$table->data['field' . $i][2] = html_print_image('images/spinner.gif', true);
// Store the value in a hidden to keep it on first execution
$table->data['field'.$i][1] .= html_print_input_hidden('field'.$i.'_value', !empty($action['field'.$i]) ? $action['field'.$i] : '', true);
$table->data['field'.$i][2] .= html_print_input_hidden('field'.$i.'_recovery_value', !empty($action['field'.$i.'_recovery']) ? $action['field'.$i.'_recovery'] : '', true);
$table->data['field' . $i][1] .= html_print_input_hidden('field' . $i . '_value',
!empty($action['field' . $i]) ?
$action['field' . $i] : '', true);
$table->data['field' . $i][2] .= html_print_input_hidden('field' . $i . '_recovery_value',
!empty($action['field' . $i . '_recovery']) ?
$action['field' . $i . '_recovery'] : '', true);
}
echo '<form method="post" action="index.php?sec=' . $sec . '&sec2=godmode/alerts/alert_actions&pure='.$pure.'">';
html_print_table ($table);
$table_html = html_print_table ($table, true);
////////////////////////////////////////////////////////////////////////
//Hack to hook the bubble dialog of clippy in any place, the intro.js
//fails with new elements in the dom from javascript code
//----------------------------------------------------------------------
$table_html = str_replace(
'<tr id="table_macros-field1" style="" class="datos2">',
"</tbody>
<tbody id=\"clippy_fields\">
<tr id=\"table_macros-field1\" class=\"datos\">",
$table_html);
////////////////////////////////////////////////////////////////////////
echo $table_html;
echo '<div class="action-buttons" style="width: '.$table->width.'">';
if ($id) {
@ -158,9 +177,9 @@ if ($id) {
}
}
else {
html_print_input_hidden ('update_action', 1);
html_print_submit_button (__('Update'), 'create', false, 'class="sub upd"');
html_print_input_hidden ('update_action', 1);
html_print_submit_button (__('Update'), 'create', false, 'class="sub upd"');
}
}
else {
@ -256,7 +275,7 @@ $(document).ready (function () {
render_command_preview(original_command);
render_command_recovery_preview(original_command);
$(".fields").keyup (function() {
render_command_preview(original_command);
});

7
pandora_console/include/functions_clippy.php
View File

@ -28,6 +28,12 @@ function clippy_start($sec2) {
$sec2 = str_replace('/', '_', $sec2);
//Avoid some case the other parameters in the url
if (strstr($sec2, "&") !== false) {
$chunks = explode("&", $sec2);
$sec2 = $chunks[0];
}
if ($sec2 != 'homepage') {
if (is_file("include/help/clippy/" . $sec2 . ".php")) {
require("include/help/clippy/" . $sec2 . ".php");
@ -77,7 +83,6 @@ function clippy_write_javascript_helps_steps($tours) {
$clippy = get_cookie('clippy', false);
set_cookie('clippy', null);
//Get the help steps from a task
$steps = $tours['tours'][$clippy]['steps'];
if ($first_step_by_default) {

65
pandora_console/include/help/clippy/godmode_agentes_configurar_agente.php
View File

@ -31,11 +31,12 @@ function clippy_start_page() {
$return_tours['tours']['monitoring_server_step_3'] = array();
$return_tours['tours']['monitoring_server_step_3']['steps'] = array();
$return_tours['tours']['monitoring_server_step_3']['steps'][] = array(
'element'=> '#clippy',
'element' => '#clippy',
'intro' => __('Now you must go to Modules. Don\'t worry I\'ll lead you.')
);
$return_tours['tours']['monitoring_server_step_3']['steps'][] = array(
'element'=> "img[alt='Modules']",
'element' => "img[alt='Modules']",
'position' => 'left',
'intro' => __('Click in this tab..')
);
$return_tours['tours']['monitoring_server_step_3']['conf'] = array();
@ -123,6 +124,66 @@ function clippy_start_page() {
$return_tours['tours']['monitoring_server_step_6']['conf']['show_step_numbers'] = 0;
//==================================================================
//==================================================================
//Help tour about the email alert module (step 7)
//------------------------------------------------------------------
$return_tours['tours']['email_alert_module_step_7'] = array();
$return_tours['tours']['email_alert_module_step_7']['steps'] = array();
$return_tours['tours']['email_alert_module_step_7']['steps'][] = array(
'element' => "img[alt='Alerts']",
'position' => 'left',
'intro' => __('Click on alerts tab and then fill the form to add an alert.')
);
$return_tours['tours']['email_alert_module_step_7']['conf'] = array();
$return_tours['tours']['email_alert_module_step_7']['conf']['show_bullets'] = 0;
$return_tours['tours']['email_alert_module_step_7']['conf']['show_step_numbers'] = 0;
$return_tours['tours']['email_alert_module_step_7']['conf']['next_help'] = 'email_alert_module_step_8';
//==================================================================
//==================================================================
//Help tour about the email alert module (step 8)
//------------------------------------------------------------------
$return_tours['tours']['email_alert_module_step_8'] = array();
$return_tours['tours']['email_alert_module_step_8']['steps'] = array();
$return_tours['tours']['email_alert_module_step_8']['steps'][] = array(
'element' => "select[name='id_agent_module']",
'intro' => __('Select the critical module.')
);
$return_tours['tours']['email_alert_module_step_8']['steps'][] = array(
'element' => "select[name='template']",
'intro' => __('In template select "Critical Condition".')
);
$return_tours['tours']['email_alert_module_step_8']['steps'][] = array(
'element' => "select[name='action_select']",
'intro' => __('Now, select the action created before.')
);
$return_tours['tours']['email_alert_module_step_8']['steps'][] = array(
'element' => "input[name='add']",
'position' => 'left',
'intro' => __('Click on Add Alert button to create the alert.')
);
$return_tours['tours']['email_alert_module_step_8']['conf'] = array();
$return_tours['tours']['email_alert_module_step_8']['conf']['show_bullets'] = 0;
$return_tours['tours']['email_alert_module_step_8']['conf']['show_step_numbers'] = 0;
$return_tours['tours']['email_alert_module_step_8']['conf']['next_help'] = 'email_alert_module_step_9';
//==================================================================
//==================================================================
//Help tour about the email alert module (step 9)
//------------------------------------------------------------------
$return_tours['tours']['email_alert_module_step_9'] = array();
$return_tours['tours']['email_alert_module_step_9']['steps'] = array();
$return_tours['tours']['email_alert_module_step_9']['steps'][] = array(
'element' => "img[alt='View']",
'position' => 'left',
'intro' => __('To test the alert you\'ve just created go to the main view by clicking on the eye tab.')
);
$return_tours['tours']['email_alert_module_step_9']['conf'] = array();
$return_tours['tours']['email_alert_module_step_9']['conf']['show_bullets'] = 0;
$return_tours['tours']['email_alert_module_step_9']['conf']['show_step_numbers'] = 0;
$return_tours['tours']['email_alert_module_step_9']['conf']['next_help'] = 'email_alert_module_step_10';
//==================================================================
return $return_tours;
}
?>

2
pandora_console/include/help/clippy/godmode_agentes_modificar_agente.php
View File

@ -44,7 +44,7 @@ function clippy_start_page() {
);
$return_tours['tours']['monitoring_server_step_1']['conf'] = array();
$return_tours['tours']['monitoring_server_step_1']['conf']['show_bullets'] = 0;
$return_tours['tours']['monitoring_server_step_1']['conf']['show_step_numbers'] = 1;
$return_tours['tours']['monitoring_server_step_1']['conf']['show_step_numbers'] = 0;
$return_tours['tours']['monitoring_server_step_1']['conf']['next_help'] = 'monitoring_server_step_2';
//==================================================================

66
pandora_console/include/help/clippy/godmode_alerts_alert_actions.php Normal file
View File

@ -0,0 +1,66 @@
<?php
// Pandora FMS - http://pandorafms.com
// ==================================================
// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public License
// as published by the Free Software Foundation; version 2
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
/**
* @package Include
* @subpackage Clippy
*/
function clippy_start_page() {
$return_tours = array();
$return_tours['first_step_by_default'] = false;
$return_tours['tours'] = array();
//==================================================================
//Help tour about the email alert module (step 2)
//------------------------------------------------------------------
$return_tours['tours']['email_alert_module_step_2'] = array();
$return_tours['tours']['email_alert_module_step_2']['steps'] = array();
$return_tours['tours']['email_alert_module_step_2']['steps'][] = array(
'element'=> 'input[name="create"]',
'position' => 'left',
'intro' => __('Let me show you how to create an email action: Click on Create button and fill the form showed in the following screen.')
);
$return_tours['tours']['email_alert_module_step_2']['conf'] = array();
$return_tours['tours']['email_alert_module_step_2']['conf']['show_bullets'] = 0;
$return_tours['tours']['email_alert_module_step_2']['conf']['show_step_numbers'] = 0;
$return_tours['tours']['email_alert_module_step_2']['conf']['next_help'] = 'email_alert_module_step_3';
//==================================================================
//==================================================================
//Help tour about the email alert module (step 4)
//------------------------------------------------------------------
$return_tours['tours']['email_alert_module_step_4'] = array();
$return_tours['tours']['email_alert_module_step_4']['steps'] = array();
$return_tours['tours']['email_alert_module_step_4']['steps'][] = array(
'element'=> '#clippy',
'intro' => __('Now, you have to go to the monitors list and look for a critical module to apply the alert.')
);
$return_tours['tours']['email_alert_module_step_4']['steps'][] = array(
'element'=> '#icon_oper-agents',
'position' => 'right',
'intro' => __('Click on the arrow to drop down the Monitoring submenu and select Monitor Detail.')
);
$return_tours['tours']['email_alert_module_step_4']['conf'] = array();
$return_tours['tours']['email_alert_module_step_4']['conf']['show_bullets'] = 0;
$return_tours['tours']['email_alert_module_step_4']['conf']['show_step_numbers'] = 0;
$return_tours['tours']['email_alert_module_step_4']['conf']['next_help'] = 'email_alert_module_step_5';
//==================================================================
return $return_tours;
}
?>

79
pandora_console/include/help/clippy/godmode_alerts_configure_alert_action.php Normal file
View File

@ -0,0 +1,79 @@
<?php
// Pandora FMS - http://pandorafms.com
// ==================================================
// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public License
// as published by the Free Software Foundation; version 2
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
/**
* @package Include
* @subpackage Clippy
*/
function clippy_start_page() {
$return_tours = array();
$return_tours['first_step_by_default'] = false;
$return_tours['tours'] = array();
//==================================================================
//Help tour about the email alert module (step 3)
//------------------------------------------------------------------
$return_tours['tours']['email_alert_module_step_3'] = array();
$return_tours['tours']['email_alert_module_step_3']['steps'] = array();
$return_tours['tours']['email_alert_module_step_3']['steps'][] = array(
'element'=> 'input[name="name"]',
'intro' => __('Fill the name of your action.')
);
$return_tours['tours']['email_alert_module_step_3']['steps'][] = array(
'element'=> 'select[name="group"]',
'intro' => __('Select the group in the drop-down list and filter for ACL (the user in this group can use your action to create an alert).')
);
$return_tours['tours']['email_alert_module_step_3']['steps'][] = array(
'element'=> 'select[name="id_command"]',
'intro' => __('In the command field select "email".')
);
$return_tours['tours']['email_alert_module_step_3']['steps'][] = array(
'element'=> 'input[name="action_threshold"]',
'intro' => __('In the threshold field enter the seconds. The help icon show more information.') . '<br />' .
ui_print_help_icon ('action_threshold', true, '', 'images/help.png')
);
$return_tours['tours']['email_alert_module_step_3']['steps'][] = array(
'element'=> '#clippy_fields',
'position' => 'top',
'intro' => __('In the first field enter the email address/addresses where you want to receive the email alerts separated with comas ( , ) or white spaces.')
);
$return_tours['tours']['email_alert_module_step_3']['steps'][] = array(
'element'=> '#clippy_fields',
'position' => 'top',
'intro' => __('In the "Subject" field you can use the macros _agent_ or _module_ for each name.')
);
$return_tours['tours']['email_alert_module_step_3']['steps'][] = array(
'element'=> '#clippy_fields',
'position' => 'top',
'intro' => __('In the text field, you can also use macros. Get more information about the macros by clicking on the help icon.') . '<br />' .
ui_print_help_icon ('alert_config', true, '', 'images/help.png')
);
$return_tours['tours']['email_alert_module_step_3']['steps'][] = array(
'element'=> 'input[name="create"]',
'position' => 'left',
'intro' => __('Click on Create button to create the action.')
);
$return_tours['tours']['email_alert_module_step_3']['conf'] = array();
$return_tours['tours']['email_alert_module_step_3']['conf']['show_bullets'] = 0;
$return_tours['tours']['email_alert_module_step_3']['conf']['show_step_numbers'] = 0;
$return_tours['tours']['email_alert_module_step_3']['conf']['next_help'] = 'email_alert_module_step_4';
//==================================================================
return $return_tours;
}
?>

45
pandora_console/include/help/clippy/homepage.php
View File

@ -55,15 +55,19 @@ function clippy_start_page_homepage() {
$return_tours['tours']['homepage']['steps'][] = array(
'element'=> '#clippy',
'intro' => __('Which task would you like to do first?') . '<br/><br/>' .
'<ul style="text-align: left; margin-left: 3px; list-style-type: disc;">' .
'<ul style="text-align: left; margin-left: 10px; list-style-type: disc;">' .
'<li>' .
"<a href='javascript: clippy_go_link_show_help(\"index.php?sec=gagente&sec2=godmode/agentes/modificar_agente\", \"monitoring_server_step_1\");'>" .
//'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&clippy=monitoring_server">' .
__('Ping to a Linux or Windows server with a Pandora FMS agent') .
'</a>' .
'</li>' .
'<li>' . __('Monitor a switch with remote SNMP') . '</li>' .
'<li>' . __('Monitor a Windows server with remote WMI') . '</li>' .
'<li>' .
"<a href='javascript: clippy_go_link_show_help(\"index.php\", \"email_alert_module_step_1\");'>" .
__('Create a alert by email in a critical module.') .
'</a>' .
'</li>' .
//'<li>' . __('Monitor a switch with remote SNMP') . '</li>' .
//'<li>' . __('Monitor a Windows server with remote WMI') . '</li>' .
'</ul>'
);
$return_tours['tours']['homepage']['conf'] = array();
@ -114,6 +118,39 @@ function clippy_start_page_homepage() {
//==================================================================
//==================================================================
//Help tour about the email alert module (step 1)
//------------------------------------------------------------------
$return_tours['tours']['email_alert_module_step_1'] = array();
$return_tours['tours']['email_alert_module_step_1']['steps'] = array();
$return_tours['tours']['email_alert_module_step_1']['steps'][] = array(
'element'=> '#clippy',
'intro' => __('The first thing you have to do is to setup the config email in the Pandora FMS Server.') .
'<br />' .
ui_print_help_icon ('context_pandora_server_email', true, '', 'images/help.png') .
'<br />' .
__('If you have it already configured you can go to the next step.')
);
$return_tours['tours']['email_alert_module_step_1']['steps'][] = array(
'element'=> '#icon_god-alerts',
'position' => 'top',
'intro' => __('Now, pull down the Manage alerts menu and click on Actions. ')
);
$return_tours['tours']['email_alert_module_step_1']['conf'] = array();
$return_tours['tours']['email_alert_module_step_1']['conf']['show_bullets'] = 0;
$return_tours['tours']['email_alert_module_step_1']['conf']['show_step_numbers'] = 0;
$return_tours['tours']['email_alert_module_step_1']['conf']['complete_js'] = "
;
";
$return_tours['tours']['email_alert_module_step_1']['conf']['exit_js'] = "
location.reload();
";
$return_tours['tours']['email_alert_module_step_1']['conf']['next_help'] = 'email_alert_module_step_2';
//==================================================================
return $return_tours;
}
?>

2
pandora_console/include/help/clippy/module_unknow.php
View File

@ -42,7 +42,7 @@ function clippy_module_unknow() {
'<tr>' .
'<td class="context_help_body">' .
__('Unknown modules are modules which receive data normally at least in one occassion, but at this time are not receving data. Please check our troubleshoot help page to help you determine why you have unknown modules.') .
ui_print_help_icon ('context_module_unknow', true, '', 'images/help_w.png') .
ui_print_help_icon ('context_module_unknow', true, '', 'images/help.png') .
'</td>' .
'</tr>' .
'</table>'

71
pandora_console/include/help/clippy/operation_agentes_status_monitor.php Normal file
View File

@ -0,0 +1,71 @@
<?php
// Pandora FMS - http://pandorafms.com
// ==================================================
// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public License
// as published by the Free Software Foundation; version 2
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
/**
* @package Include
* @subpackage Clippy
*/
function clippy_start_page() {
$return_tours = array();
$return_tours['first_step_by_default'] = false;
$return_tours['tours'] = array();
//==================================================================
//Help tour about the email alert module (step 5)
//------------------------------------------------------------------
$return_tours['tours']['email_alert_module_step_5'] = array();
$return_tours['tours']['email_alert_module_step_5']['steps'] = array();
$return_tours['tours']['email_alert_module_step_5']['steps'][] = array(
'element'=> 'select[name="status"]',
'intro' => __('Now, you have to go to the monitors list and look for a "critical" module to apply the alert.')
);
$return_tours['tours']['email_alert_module_step_5']['steps'][] = array(
'element'=> 'input[name="ag_freestring"]',
'intro' => __('If you know the name of the agent or the name of the module in critical status, type it in this field to make the module list shorter. You can write the entire name or just a part of it.')
);
$return_tours['tours']['email_alert_module_step_5']['steps'][] = array(
'element'=> 'input[name="uptbutton"]',
'position' => 'left',
'intro' => __('Click on Show button to get the modules list filtered.')
);
$return_tours['tours']['email_alert_module_step_5']['conf'] = array();
$return_tours['tours']['email_alert_module_step_5']['conf']['show_bullets'] = 0;
$return_tours['tours']['email_alert_module_step_5']['conf']['show_step_numbers'] = 0;
$return_tours['tours']['email_alert_module_step_5']['conf']['next_help'] = 'email_alert_module_step_6';
//==================================================================
//==================================================================
//Help tour about the email alert module (step 6)
//------------------------------------------------------------------
$return_tours['tours']['email_alert_module_step_6'] = array();
$return_tours['tours']['email_alert_module_step_6']['steps'] = array();
$return_tours['tours']['email_alert_module_step_6']['steps'][] = array(
'element'=> '#table3',
'position' => 'top',
'intro' => __('Now, to edit the module, click on the wrench that appears in the type column.')
);
$return_tours['tours']['email_alert_module_step_6']['conf'] = array();
$return_tours['tours']['email_alert_module_step_6']['conf']['show_bullets'] = 0;
$return_tours['tours']['email_alert_module_step_6']['conf']['show_step_numbers'] = 0;
$return_tours['tours']['email_alert_module_step_6']['conf']['next_help'] = 'email_alert_module_step_7';
//==================================================================
return $return_tours;
}
?>

45
pandora_console/include/help/clippy/operation_agentes_ver_agente.php Normal file
View File

@ -0,0 +1,45 @@
<?php
// Pandora FMS - http://pandorafms.com
// ==================================================
// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public License
// as published by the Free Software Foundation; version 2
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
/**
* @package Include
* @subpackage Clippy
*/
function clippy_start_page() {
$return_tours = array();
$return_tours['first_step_by_default'] = false;
$return_tours['tours'] = array();
//==================================================================
//Help tour about the email alert module (step 10)
//------------------------------------------------------------------
$return_tours['tours']['email_alert_module_step_10'] = array();
$return_tours['tours']['email_alert_module_step_10']['steps'] = array();
$return_tours['tours']['email_alert_module_step_10']['steps'][] = array(
'element'=> '#table8',
'position' => 'top',
'intro' => __('The last step is to check the alert created. Click on the round icon to force the action execution and after a few minutes you will receive the alert in your email.')
);
$return_tours['tours']['email_alert_module_step_10']['conf'] = array();
$return_tours['tours']['email_alert_module_step_10']['conf']['show_bullets'] = 0;
$return_tours['tours']['email_alert_module_step_10']['conf']['show_step_numbers'] = 0;
//==================================================================
return $return_tours;
}
?>

38
pandora_console/include/help/en/help_context_pandora_server_email.php Executable file
View File

@ -0,0 +1,38 @@
<?php
/**
* @package Include/help/en
*/
?>
<h1>Config the Pandora Server for email alerts</h1>
<p>You must to edit the <i>"Pandora Server conf file"</i>, normaly it is in:
<pre>
/etc/pandora_server/pandora_server.conf
</pre>
And you must set these values:
<pre>
# mta_address: External Mailer (MTA) IP Address to be used by Pandora FMS internal email capabilities
mta_address localhost
# mta_port, this is the mail server port (default 25)
mta_port 25
# mta_user MTA User (if needed for auth, FQD or simple user, depending on your server)
mta_user myuser@mydomain.com
# mta_pass MTA Pass (if needed for auth)
mta_pass mypassword
# mta_auth MTA Auth system (if needed, it supports LOGIN, PLAIN, CRAM-MD5, DIGEST-MD)
mta_auth LOGIN
# mta_from Email address that sends the mail, by default is pandora@localhost
# probably you need to change it to avoid problems with your antispam
mta_from Pandora FMS <pandora@mydomain.com>
</pre>
</p>

22
pandora_console/operation/agentes/status_monitor.php
View File

@ -520,7 +520,7 @@ if ($custom_fields === false) $custom_fields = array();
foreach ($custom_fields as $custom_field) {
$row = array();
$row[0] = $custom_field['name'];
$custom_field_value = "";
if (!empty($ag_custom_fields)) {
$custom_field_value = $ag_custom_fields[$custom_field['id_field']];
@ -529,7 +529,7 @@ foreach ($custom_fields as $custom_field) {
}
}
$row[1] = html_print_input_text ("ag_custom_fields[".$custom_field['id_field']."]", $custom_field_value, '', 100, 300, true);
$table_custom_fields->data[] = $row;
}
@ -1067,7 +1067,19 @@ foreach ($result as $row) {
$data[1] .= '</a></strong>';
}
$data[2] = html_print_image("images/" . modules_show_icon_type ($row["module_type"]), true);
$data[2] = html_print_image("images/" . modules_show_icon_type ($row["module_type"]), true);
if (check_acl ($config['id_user'], $row['id_group'], "AW"))
$data[2] .= '<a href="' .
'index.php?' .
'sec=gagente&amp;' .
'sec2=godmode/agentes/configurar_agente&amp;' .
'id_agente=' . $row['id_agent'] . '&amp;' .
'tab=module&amp;' .
'id_agent_module=' . $row["id_agente_modulo"] . '&amp;' .
'edit_module=1">' .
html_print_image("images/config.png", true,
array("alt" => '0', "border" => "", "title" => __('Edit'))) .
'</a>';
$data[3] = ui_print_truncate_text($row["module_name"], 'agent_small', false, true, true);
if ($row["extended_info"] != "") {
@ -1080,10 +1092,6 @@ foreach ($result as $row) {
'style' => 'width: 20px; margin-left: 3px;'));
}
/*
$data[4] = ui_print_truncate_text($row['tags'], 'agent_small', false, true, true, '[&hellip;]', 'font-size:7pt;');
*/
$data[5] = ($row['module_interval'] == 0) ?
human_time_description_raw($row['agent_interval'])
:

2
pandora_console/operation/menu.php
View File

@ -303,7 +303,7 @@ if (check_acl ($config['id_user'], 0, "IR") == 1) {
$sub[$sec2]["subsecs"] = array(
"operation/incidents/incident_detail",
"operation/integria_incidents");
$sub2 = array ();
$sub2[$sec2sub]["text"] = __('Statistics');