diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 6362c1a3d3..1c4cadd3b0 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,13 @@ +2011-08-24 Sancho Lerena + + * include/help/en/help_snmp_alert_field1.php: New help page. + + * include/help/en/help_module_definition.php: Fixed odd chars. + + * images/groups_small/g_: Deleted unused icons. + + * images/groups_small/transmit.ok.png: Added margins and padding. + 2011-08-24 Miguel de Dios * include/functions_modules.php: added the call to enterprise function for diff --git a/pandora_console/general/pandora_help.php b/pandora_console/general/pandora_help.php index c9e80ddce2..0c3274d2d3 100644 --- a/pandora_console/general/pandora_help.php +++ b/pandora_console/general/pandora_help.php @@ -19,13 +19,13 @@ require_once ("../include/config.php"); require_once ("../include/functions.php"); require_once ("../include/functions_html.php"); ?> - +<html style="height:100%; margin-top: 25px; margin-left: 15px; margin-right: 15px;"><head><title> <?php echo __('Pandora FMS help system'); ?> '; ?> - + '; echo '
'; -echo ''; +echo ''; echo html_print_image('images/pandora_textlogo.png', true, array("border" => '0')); echo ""; -echo '

'.__('Pandora FMS help system').'

'; +echo '

'.__('Pandora FMS help system').'

'; echo '
'; echo '
'; echo '
'; @@ -78,7 +78,7 @@ echo '
'; require_once ($help_file); echo '
'; echo '


'; -echo '
'; +echo '
'; include ('footer.php'); echo '
'; ?> diff --git a/pandora_console/images/groups_small/g_apps.bad.png b/pandora_console/images/groups_small/g_apps.bad.png deleted file mode 100644 index 91ff715828..0000000000 Binary files a/pandora_console/images/groups_small/g_apps.bad.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_apps.default.png b/pandora_console/images/groups_small/g_apps.default.png deleted file mode 100644 index c5a71a0c9c..0000000000 Binary files a/pandora_console/images/groups_small/g_apps.default.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_apps.ok.png b/pandora_console/images/groups_small/g_apps.ok.png deleted file mode 100644 index 3c052229f7..0000000000 Binary files a/pandora_console/images/groups_small/g_apps.ok.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_apps.png b/pandora_console/images/groups_small/g_apps.png deleted file mode 100644 index 4f9be5a260..0000000000 Binary files a/pandora_console/images/groups_small/g_apps.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_apps.warning.png b/pandora_console/images/groups_small/g_apps.warning.png deleted file mode 100644 index d65c54b74d..0000000000 Binary files a/pandora_console/images/groups_small/g_apps.warning.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_comms.bad.png b/pandora_console/images/groups_small/g_comms.bad.png deleted file mode 100644 index 4c93200156..0000000000 Binary files a/pandora_console/images/groups_small/g_comms.bad.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_comms.default.png b/pandora_console/images/groups_small/g_comms.default.png deleted file mode 100644 index 9ebefe0a2e..0000000000 Binary files a/pandora_console/images/groups_small/g_comms.default.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_comms.ok.png b/pandora_console/images/groups_small/g_comms.ok.png deleted file mode 100644 index f3fc5c0bb6..0000000000 Binary files a/pandora_console/images/groups_small/g_comms.ok.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_comms.png b/pandora_console/images/groups_small/g_comms.png deleted file mode 100644 index 8cdfe024b1..0000000000 Binary files a/pandora_console/images/groups_small/g_comms.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_comms.warning.png b/pandora_console/images/groups_small/g_comms.warning.png deleted file mode 100644 index 60ee2dca7d..0000000000 Binary files a/pandora_console/images/groups_small/g_comms.warning.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_db.bad.png b/pandora_console/images/groups_small/g_db.bad.png deleted file mode 100644 index ae19d79a6b..0000000000 Binary files a/pandora_console/images/groups_small/g_db.bad.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_db.default.png b/pandora_console/images/groups_small/g_db.default.png deleted file mode 100644 index 8f75d11858..0000000000 Binary files a/pandora_console/images/groups_small/g_db.default.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_db.ok.png b/pandora_console/images/groups_small/g_db.ok.png deleted file mode 100644 index 781ffd5dde..0000000000 Binary files a/pandora_console/images/groups_small/g_db.ok.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_db.png b/pandora_console/images/groups_small/g_db.png deleted file mode 100644 index 9392a79fff..0000000000 Binary files a/pandora_console/images/groups_small/g_db.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_db.warning.png b/pandora_console/images/groups_small/g_db.warning.png deleted file mode 100644 index c1e1efa047..0000000000 Binary files a/pandora_console/images/groups_small/g_db.warning.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_firewall.bad.png b/pandora_console/images/groups_small/g_firewall.bad.png deleted file mode 100644 index 4845a86002..0000000000 Binary files a/pandora_console/images/groups_small/g_firewall.bad.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_firewall.default.png b/pandora_console/images/groups_small/g_firewall.default.png deleted file mode 100644 index f2fdcb0afd..0000000000 Binary files a/pandora_console/images/groups_small/g_firewall.default.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_firewall.ok.png b/pandora_console/images/groups_small/g_firewall.ok.png deleted file mode 100644 index 120c057397..0000000000 Binary files a/pandora_console/images/groups_small/g_firewall.ok.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_firewall.png b/pandora_console/images/groups_small/g_firewall.png deleted file mode 100644 index d7f788ba80..0000000000 Binary files a/pandora_console/images/groups_small/g_firewall.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_firewall.warning.png b/pandora_console/images/groups_small/g_firewall.warning.png deleted file mode 100644 index 9e229109bf..0000000000 Binary files a/pandora_console/images/groups_small/g_firewall.warning.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_ids.bad.png b/pandora_console/images/groups_small/g_ids.bad.png deleted file mode 100644 index e0193b50c3..0000000000 Binary files a/pandora_console/images/groups_small/g_ids.bad.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_ids.default.png b/pandora_console/images/groups_small/g_ids.default.png deleted file mode 100644 index cd434e0606..0000000000 Binary files a/pandora_console/images/groups_small/g_ids.default.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_ids.ok.png b/pandora_console/images/groups_small/g_ids.ok.png deleted file mode 100644 index 1b25fc8c99..0000000000 Binary files a/pandora_console/images/groups_small/g_ids.ok.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_ids.png b/pandora_console/images/groups_small/g_ids.png deleted file mode 100644 index e2f2147b5f..0000000000 Binary files a/pandora_console/images/groups_small/g_ids.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_ids.warning.png b/pandora_console/images/groups_small/g_ids.warning.png deleted file mode 100644 index 0979e21a74..0000000000 Binary files a/pandora_console/images/groups_small/g_ids.warning.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_others.bad.png b/pandora_console/images/groups_small/g_others.bad.png deleted file mode 100644 index edda4a298b..0000000000 Binary files a/pandora_console/images/groups_small/g_others.bad.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_others.default.png b/pandora_console/images/groups_small/g_others.default.png deleted file mode 100644 index ce1aa5f47d..0000000000 Binary files a/pandora_console/images/groups_small/g_others.default.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_others.ok.png b/pandora_console/images/groups_small/g_others.ok.png deleted file mode 100644 index f110240957..0000000000 Binary files a/pandora_console/images/groups_small/g_others.ok.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_others.png b/pandora_console/images/groups_small/g_others.png deleted file mode 100644 index 6e21161a65..0000000000 Binary files a/pandora_console/images/groups_small/g_others.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_others.warning.png b/pandora_console/images/groups_small/g_others.warning.png deleted file mode 100644 index e7d4b9dbb9..0000000000 Binary files a/pandora_console/images/groups_small/g_others.warning.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_servers.bad.png b/pandora_console/images/groups_small/g_servers.bad.png deleted file mode 100644 index c1798decf1..0000000000 Binary files a/pandora_console/images/groups_small/g_servers.bad.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_servers.default.png b/pandora_console/images/groups_small/g_servers.default.png deleted file mode 100644 index a6939c804e..0000000000 Binary files a/pandora_console/images/groups_small/g_servers.default.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_servers.ok.png b/pandora_console/images/groups_small/g_servers.ok.png deleted file mode 100644 index dc0f6e7090..0000000000 Binary files a/pandora_console/images/groups_small/g_servers.ok.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_servers.png b/pandora_console/images/groups_small/g_servers.png deleted file mode 100644 index 3e2ede8d29..0000000000 Binary files a/pandora_console/images/groups_small/g_servers.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_servers.warning.png b/pandora_console/images/groups_small/g_servers.warning.png deleted file mode 100644 index 015bfb9358..0000000000 Binary files a/pandora_console/images/groups_small/g_servers.warning.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_workstation.bad.png b/pandora_console/images/groups_small/g_workstation.bad.png deleted file mode 100644 index c91d5b65ab..0000000000 Binary files a/pandora_console/images/groups_small/g_workstation.bad.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_workstation.default.png b/pandora_console/images/groups_small/g_workstation.default.png deleted file mode 100644 index b8717f09a8..0000000000 Binary files a/pandora_console/images/groups_small/g_workstation.default.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_workstation.ok.png b/pandora_console/images/groups_small/g_workstation.ok.png deleted file mode 100644 index 524612b00f..0000000000 Binary files a/pandora_console/images/groups_small/g_workstation.ok.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_workstation.png b/pandora_console/images/groups_small/g_workstation.png deleted file mode 100644 index c4432bc360..0000000000 Binary files a/pandora_console/images/groups_small/g_workstation.png and /dev/null differ diff --git a/pandora_console/images/groups_small/g_workstation.warning.png b/pandora_console/images/groups_small/g_workstation.warning.png deleted file mode 100644 index f1c00a5d2e..0000000000 Binary files a/pandora_console/images/groups_small/g_workstation.warning.png and /dev/null differ diff --git a/pandora_console/images/groups_small/printer.ok.png b/pandora_console/images/groups_small/printer.ok.png index e85430df61..8f17c7a050 100644 Binary files a/pandora_console/images/groups_small/printer.ok.png and b/pandora_console/images/groups_small/printer.ok.png differ diff --git a/pandora_console/images/groups_small/server_database.ok.png b/pandora_console/images/groups_small/server_database.ok.png index 1d6799ae08..a20fa2b821 100644 Binary files a/pandora_console/images/groups_small/server_database.ok.png and b/pandora_console/images/groups_small/server_database.ok.png differ diff --git a/pandora_console/images/groups_small/transmit.ok.png b/pandora_console/images/groups_small/transmit.ok.png index f247cd946f..f4bbd71291 100644 Binary files a/pandora_console/images/groups_small/transmit.ok.png and b/pandora_console/images/groups_small/transmit.ok.png differ diff --git a/pandora_console/images/groups_small/world.bad.png b/pandora_console/images/groups_small/world.bad.png index cc5a584997..9f21eed526 100644 Binary files a/pandora_console/images/groups_small/world.bad.png and b/pandora_console/images/groups_small/world.bad.png differ diff --git a/pandora_console/images/groups_small/world.ok.png b/pandora_console/images/groups_small/world.ok.png index bf79037c77..012eef9cdd 100644 Binary files a/pandora_console/images/groups_small/world.ok.png and b/pandora_console/images/groups_small/world.ok.png differ diff --git a/pandora_console/include/help/en/help_module_definition.php b/pandora_console/include/help/en/help_module_definition.php index e488d4abbb..0c6d3cb7a4 100644 --- a/pandora_console/include/help/en/help_module_definition.php +++ b/pandora_console/include/help/en/help_module_definition.php @@ -7,6 +7,6 @@ There are two modes for an agent:
    -
  • Learning mode: all the modules sent by the agent are accepted. If modules are not defined, they will be automatically defined by the system. It is recommended to activate the agents in this mode and change it once the user is familiar with Pandora FMS.
  • -
  • Normal mode: the modules in this mode must be configured manually. The self definition of the modules is not allowed in this mode.
  • +
  • Learning mode: all the modules sent by the agent are accepted. If modules are not defined, they will be automatically defined by the system. It is recommended to activate the agents in this mode and change it once the user is familiar with Pandora FMS.
  • +
  • Normal mode: the modules in this mode must be configured manually. The self definition of the modules is not allowed in this mode.
diff --git a/pandora_console/include/help/en/help_snmp_alert_field1.php b/pandora_console/include/help/en/help_snmp_alert_field1.php new file mode 100644 index 0000000000..991b711ded --- /dev/null +++ b/pandora_console/include/help/en/help_snmp_alert_field1.php @@ -0,0 +1,16 @@ + +

SNMP Trap - Alert field macros

+

+ +Once we've got the data fields, we must use them in the alert. With this purpose, the special macros _snmp_f1_, _snmp_f2_ and _snmp_f3_ are used. Using these macros doesn't have any sense out of SNMP trap alerts. + +To build the message, we would use the following string in Field1. + +Chassis Alert: _snmp_f2_ in device _snmp_f1_ + +You can use these macros in field1, field2 and field3 +