diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 5cddc48c35..2413907b27 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,166 @@ +2013-05-20 Sergio Martin + + * include/functions_html.php + include/styles/pandora.css + include/functions_visual_map.php + include/functions_agents.php + include/languages/util-bzr-update + include/languages/util-generate-tarball + include/languages/util-all + include/languages/util-create-po + include/languages/util-README + include/languages/util-update-po + include/languages/util-create-template + include/languages/util-compile-mo + include/constants.php + operation/tree.php + operation/visual_console/render_view.php + operation/users/user_edit.php + operation/events/events.build_table.php + operation/events/events_list.php + operation/events/events.php + operation/agentes/status_monitor.php + images/status_sets/faces/severity_warning_pixel.png + images/status_sets/faces/agent_critical_ball.png + images/status_sets/faces/severity_major_pixel.png + images/status_sets/faces/module_warning_ball.png + images/status_sets/faces/module_ok_ball.png + images/status_sets/faces/agent_no_data_ball.png + images/status_sets/faces/severity_minor_pixel.png + images/status_sets/faces/agent_ok_ball.png + images/status_sets/faces/severity_normal_pixel.png + images/status_sets/faces/server_down_ball.png + images/status_sets/faces/alert_not_fired_ball.png + images/status_sets/faces/severity_informational_pixel.png + images/status_sets/faces/agent_down_ball.png.png + images/status_sets/faces/module_no_data_ball.png + images/status_sets/faces/alert_fired_ball.png + images/status_sets/faces/agent_warning_ball.png + images/status_sets/faces/severity_maintenance_pixel.png + images/status_sets/faces/agent_no_monitors_ball.png + images/status_sets/faces/agent_down_ball.png + images/status_sets/faces/severity_critical_pixel.png + images/status_sets/faces/alert_disabled_ball.png + images/status_sets/faces/module_critical_ball.png + images/status_sets/faces/server_ok_ball.png + images/status_sets/color_text/severity_informational.png + images/status_sets/color_text/module_critical.png + images/status_sets/color_text/server_ok.png + images/status_sets/color_text/alert_not_fired.png + images/status_sets/color_text/severity_warning_pixel.png + images/status_sets/color_text/agent_critical_ball.png + images/status_sets/color_text/severity_major_pixel.png + images/status_sets/color_text/module_warning_ball.png + images/status_sets/color_text/module_unknown.png + images/status_sets/color_text/module_ok_ball.png + images/status_sets/color_text/module_alertsfired.png + images/status_sets/color_text/module_no_data.png + images/status_sets/color_text/severity_maintenance.png + images/status_sets/color_text/agent_no_data_ball.png + images/status_sets/color_text/severity_minor_pixel.png + images/status_sets/color_text/alert_fired.png + images/status_sets/color_text/agent_ok_ball.png + images/status_sets/color_text/severity_normal_pixel.png + images/status_sets/color_text/agent_no_data.png + images/status_sets/color_text/severity_critical.png + images/status_sets/color_text/agent_no_monitors.png + images/status_sets/color_text/agent_ok.png + images/status_sets/color_text/server_down_ball.png + images/status_sets/color_text/alert_not_fired_ball.png + images/status_sets/color_text/severity_informational_pixel.png + images/status_sets/color_text/server_down.png + images/status_sets/color_text/alert_disabled.png + images/status_sets/color_text/module_unknown_ball.png + images/status_sets/color_text/severity_warning.png + images/status_sets/color_text/severity_major.png + images/status_sets/color_text/module_no_data_ball.png + images/status_sets/color_text/agent_critical.png + images/status_sets/color_text/module_warning.png + images/status_sets/color_text/alert_fired_ball.png + images/status_sets/color_text/agent_warning_ball.png + images/status_sets/color_text/severity_maintenance_pixel.png + images/status_sets/color_text/module_ok.png + images/status_sets/color_text/agent_no_monitors_ball.png + images/status_sets/color_text/severity_minor.png + images/status_sets/color_text/agent_down_ball.png + images/status_sets/color_text/severity_normal.png + images/status_sets/color_text/agent_warning.png + images/status_sets/color_text/agent_down.png + images/status_sets/color_text/severity_critical_pixel.png + images/status_sets/color_text/alert_disabled_ball.png + images/status_sets/color_text/module_critical_ball.png + images/status_sets/color_text/server_ok_ball.png + images/status_sets/default/severity_informational.png + images/status_sets/default/module_critical.png + images/status_sets/default/server_ok.png + images/status_sets/default/alert_not_fired.png + images/status_sets/default/severity_warning_pixel.png + images/status_sets/default/agent_critical_ball.png + images/status_sets/default/severity_major_pixel.png + images/status_sets/default/module_warning_ball.png + images/status_sets/default/module_unknown.png + images/status_sets/default/module_ok_ball.png + images/status_sets/default/module_alertsfired.png + images/status_sets/default/module_no_data.png + images/status_sets/default/severity_maintenance.png + images/status_sets/default/agent_no_data_ball.png + images/status_sets/default/severity_minor_pixel.png + images/status_sets/default/alert_fired.png + images/status_sets/default/agent_ok_ball.png + images/status_sets/default/severity_normal_pixel.png + images/status_sets/default/agent_no_data.png + images/status_sets/default/severity_critical.png + images/status_sets/default/agent_no_monitors.png + images/status_sets/default/agent_ok.png + images/status_sets/default/server_down_ball.png + images/status_sets/default/alert_not_fired_ball.png + images/status_sets/default/severity_informational_pixel.png + images/status_sets/default/server_down.png + images/status_sets/default/alert_disabled.png + images/status_sets/default/severity_warning.png + images/status_sets/default/severity_major.png + images/status_sets/default/module_no_data_ball.png + images/status_sets/default/agent_critical.png + images/status_sets/default/module_warning.png + images/status_sets/default/alert_fired_ball.png + images/status_sets/default/agent_warning_ball.png + images/status_sets/default/severity_maintenance_pixel.png + images/status_sets/default/module_ok.png + images/status_sets/default/agent_no_monitors_ball.png + images/status_sets/default/alert_disabled_square.png + images/status_sets/default/severity_minor.png + images/status_sets/default/agent_down_ball.png + images/status_sets/default/severity_normal.png + images/status_sets/default/agent_warning.png + images/status_sets/default/agent_down.png + images/status_sets/default/severity_critical_pixel.png + images/status_sets/default/alert_disabled_ball.png + images/status_sets/default/module_critical_ball.png + images/status_sets/default/server_ok_ball.png + godmode/groups/configure_group.php + godmode/groups/group_list.php + godmode/servers/plugin.php + godmode/alerts/configure_alert_template.php + godmode/alerts/alert_templates.php + godmode/alerts/configure_alert_action.php + godmode/alerts/configure_alert_command.php + godmode/alerts/alert_actions.php + godmode/alerts/alert_commands.php + godmode/users/user_list.php + godmode/users/profile_list.php + godmode/users/configure_user.php + godmode/users/configure_profile.php + godmode/modules/manage_network_components_form_common.php + godmode/modules/manage_network_components.php + godmode/modules/manage_nc_groups.php + godmode/reporting/visual_console_builder.php + godmode/reporting/visual_console_builder.data.php + godmode/reporting/reporting_builder.php + godmode/reporting/visual_console_builder.editor.php + godmode/tag/tag.php + godmode/category/category.php: Visual changes in icons + and colors. Add visual layers for metaconsole + 2013-05-20 Junichi Satoh * include/functions_snmp_browser.php: Added default binary path for diff --git a/pandora_console/godmode/alerts/alert_actions.php b/pandora_console/godmode/alerts/alert_actions.php index 7d4510a633..6dc46554ec 100644 --- a/pandora_console/godmode/alerts/alert_actions.php +++ b/pandora_console/godmode/alerts/alert_actions.php @@ -65,6 +65,8 @@ if ((!$copy_action) && (!$delete_action) && (!$update_action)) { } } +enterprise_hook('open_meta_frame'); + if ($copy_action) { $id = get_parameter ('id'); @@ -389,4 +391,7 @@ html_print_submit_button (__('Create'), 'create', false, 'class="sub next"'); html_print_input_hidden ('create_alert', 1); echo ''; echo ''; + +enterprise_hook('close_meta_frame'); + ?> diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php index c5c5c809ab..d0675ab524 100644 --- a/pandora_console/godmode/alerts/alert_commands.php +++ b/pandora_console/godmode/alerts/alert_commands.php @@ -128,6 +128,8 @@ if (defined('METACONSOLE')) else ui_print_page_header (__('Alerts').' » '.__('Alert commands'), "images/gm_alerts.png", false, "alert_command", true); +enterprise_hook('open_meta_frame'); + $update_command = (bool) get_parameter ('update_command'); $create_command = (bool) get_parameter ('create_command'); $delete_command = (bool) get_parameter ('delete_command'); @@ -308,4 +310,7 @@ html_print_submit_button (__('Create'), 'create', false, 'class="sub next"'); html_print_input_hidden ('create_alert', 1); echo ''; echo ''; + +enterprise_hook('close_meta_frame'); + ?> diff --git a/pandora_console/godmode/alerts/alert_templates.php b/pandora_console/godmode/alerts/alert_templates.php index 84a69df467..4ff3c8baab 100644 --- a/pandora_console/godmode/alerts/alert_templates.php +++ b/pandora_console/godmode/alerts/alert_templates.php @@ -130,6 +130,9 @@ if (!$delete_template) { ui_print_page_header (__('Alerts')." » ". __('Alert templates'), "images/gm_alerts.png", false, "alert_template", true); } } + +enterprise_hook('open_meta_frame'); + if ($update_template) { $id = (int) get_parameter ('id'); @@ -329,4 +332,7 @@ html_print_submit_button (__('Create'), 'create', false, 'class="sub next"'); html_print_input_hidden ('create_alert', 1); echo ''; echo ''; + +enterprise_hook('close_meta_frame'); + ?> diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php index 398bd38ed0..25659a5d56 100644 --- a/pandora_console/godmode/alerts/configure_alert_action.php +++ b/pandora_console/godmode/alerts/configure_alert_action.php @@ -88,6 +88,8 @@ else { ui_print_page_header (__('Alerts').' » '.__('Configure alert action'), "images/gm_alerts.png", false, "", true); } +enterprise_hook('open_meta_frame'); + $name = ''; $id_command = ''; $group = 0; //All group is 0 @@ -167,6 +169,8 @@ else { echo ''; echo ''; +enterprise_hook('close_meta_frame'); + ui_require_javascript_file ('pandora_alerts'); ?> diff --git a/pandora_console/godmode/alerts/configure_alert_command.php b/pandora_console/godmode/alerts/configure_alert_command.php index bb043ffa00..2870f4121e 100644 --- a/pandora_console/godmode/alerts/configure_alert_command.php +++ b/pandora_console/godmode/alerts/configure_alert_command.php @@ -60,6 +60,8 @@ else ui_print_page_header (__('Alerts') . ' » ' . __('Configure alert command'), "images/gm_alerts.png", false, "", true); +enterprise_hook('open_meta_frame'); + $table->width = '98%'; $table->style = array (); $table->style[0] = 'font-weight: bold'; @@ -129,4 +131,7 @@ else { } echo ''; echo ''; + +enterprise_hook('close_meta_frame'); + ?> diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php index ec61bca77e..8419df1a84 100644 --- a/pandora_console/godmode/alerts/configure_alert_template.php +++ b/pandora_console/godmode/alerts/configure_alert_template.php @@ -106,6 +106,7 @@ else { } } +enterprise_hook('open_meta_frame'); if ($duplicate_template) { $source_id = (int) get_parameter ('source_id'); @@ -706,6 +707,8 @@ else { echo ''; echo ''; +enterprise_hook('close_meta_frame'); + ui_require_javascript_file ('pandora_alerts'); ui_require_jquery_file ("ui-timepicker-addon"); ?> diff --git a/pandora_console/godmode/category/category.php b/pandora_console/godmode/category/category.php index 03d2865ba9..6352ef1f3e 100755 --- a/pandora_console/godmode/category/category.php +++ b/pandora_console/godmode/category/category.php @@ -50,6 +50,8 @@ else { ui_print_page_header (__('Categories configuration'), "images/gm_modules.png", false, "", true, $buttons); } +enterprise_hook('open_meta_frame'); + // Two actions can performed in this page: search and delete categories // Delete action: This will delete a category @@ -130,4 +132,6 @@ else { echo "
".__('No categories found')."
"; } +enterprise_hook('close_meta_frame'); + ?> diff --git a/pandora_console/godmode/groups/configure_group.php b/pandora_console/godmode/groups/configure_group.php index 15b19e9a71..fc0e36b9f9 100644 --- a/pandora_console/godmode/groups/configure_group.php +++ b/pandora_console/godmode/groups/configure_group.php @@ -26,7 +26,7 @@ if (! check_acl ($config['id_user'], 0, "PM")) { include_once($config['homedir'] . "/include/functions_groups.php"); include_once($config['homedir'] . '/include/functions_users.php'); -enterprise_include_once ('meta/include/functions_users_meta.php'); +enterprise_include_once ('meta/include/functions_agents_meta.php'); // Init vars $icon = ""; @@ -79,7 +79,7 @@ if ($id_group) { // Header if (defined('METACONSOLE')) { - user_meta_print_header(); + agents_meta_print_header(); $sec = 'advanced'; } @@ -94,6 +94,8 @@ else { } +enterprise_hook('open_meta_frame'); + $table->width = '98%'; $table->data = array (); $table->data[0][0] = __('Name'); @@ -165,6 +167,9 @@ else { } echo ''; echo ''; + +enterprise_hook('close_meta_frame'); + ?> \ No newline at end of file + diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php index 16b33dc96f..4ba32632e8 100644 --- a/pandora_console/godmode/modules/manage_network_components.php +++ b/pandora_console/godmode/modules/manage_network_components.php @@ -42,6 +42,8 @@ else { $sec = 'gmodules'; } +enterprise_hook('open_meta_frame'); + $type = (int) get_parameter ('type'); $name = (string) get_parameter ('name'); $description = (string) get_parameter ('description'); @@ -548,7 +550,10 @@ html_print_select (array (2 => __('Create a new network component'), 'id_component_type', '', '', '', '', ''); html_print_submit_button (__('Create'), 'crt', false, 'class="sub next" style="margin-left: 5px;"'); echo ''; -echo '' +echo ''; + +enterprise_hook('close_meta_frame'); + ?> \ No newline at end of file + diff --git a/pandora_console/godmode/reporting/visual_console_builder.php b/pandora_console/godmode/reporting/visual_console_builder.php index 1b613227d3..103468fa7c 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.php +++ b/pandora_console/godmode/reporting/visual_console_builder.php @@ -50,6 +50,7 @@ $activeTab = get_parameterBetweenListValues('tab', array('data', 'list_elements' $refr = (int) get_parameter ('refr', $config['vc_refr']); + //Save/Update data in DB $statusProcessInDB = null; switch ($activeTab) { @@ -95,24 +96,19 @@ switch ($activeTab) { break; case 'save': - if (!defined('METACONSOLE')) { - if ($values['name'] != "" && $values['background']) - $idVisualConsole = db_process_sql_insert('tlayout', $values); - else - $idVisualConsole = false; - - if ($idVisualConsole !== false) { - db_pandora_audit( "Visual console builder", "Create visual console #$idVisualConsole"); - $action = 'edit'; - $statusProcessInDB = array('flag' => true, 'message' => '

'.__('Successfully created.').'

'); - } - else { - db_pandora_audit( "Visual console builder", "Fail try to create visual console"); - $statusProcessInDB = array('flag' => false, 'message' => '

'.__('Could not be created.').'

'); - } + if ($values['name'] != "" && $values['background']) + $idVisualConsole = db_process_sql_insert('tlayout', $values); + else + $idVisualConsole = false; + + if ($idVisualConsole !== false) { + db_pandora_audit( "Visual console builder", "Create visual console #$idVisualConsole"); + $action = 'edit'; + $statusProcessInDB = array('flag' => true, 'message' => '

'.__('Successfully created.').'

'); } else { - + db_pandora_audit( "Visual console builder", "Fail try to create visual console"); + $statusProcessInDB = array('flag' => false, 'message' => '

'.__('Could not be created.').'

'); } break; } diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php index 15ecdc2d26..d5204af4da 100644 --- a/pandora_console/godmode/servers/plugin.php +++ b/pandora_console/godmode/servers/plugin.php @@ -86,7 +86,9 @@ if (($create != "") OR ($view != "")) { ui_print_page_header (__('Plugin update'), "images/gm_servers.png", false, "plugin_definition", true); } } - + + enterprise_hook('open_meta_frame'); + if ($create == "") { $plugin_id = get_parameter ("view",""); echo "
"; @@ -129,6 +131,7 @@ if (($create != "") OR ($view != "")) { $table->data['plugin_desc'] = $data; echo '
'; + echo '
'; echo '
'.__('General').''; html_print_table($table); @@ -284,6 +287,10 @@ if (($create != "") OR ($view != "")) { __('Update') . "'>"; } echo '
'; + + echo ''; + + enterprise_hook('close_meta_frame'); } else { if(defined('METACONSOLE')) { @@ -294,6 +301,8 @@ else { ui_print_page_header (__('Plugins registered in Pandora FMS'), "images/gm_servers.png", false, "", true); } + enterprise_hook('open_meta_frame'); + // Update plugin if (isset($_GET["update_plugin"])) { // if modified any parameter $plugin_id = get_parameter ("update_plugin", 0); @@ -474,6 +483,8 @@ else { echo "
"; echo ""; echo ""; + + enterprise_hook('close_meta_frame'); } ui_require_javascript_file('pandora_modules'); diff --git a/pandora_console/godmode/tag/tag.php b/pandora_console/godmode/tag/tag.php index 87721d46e5..a8293ea692 100644 --- a/pandora_console/godmode/tag/tag.php +++ b/pandora_console/godmode/tag/tag.php @@ -82,6 +82,8 @@ else { } +enterprise_hook('open_meta_frame'); + // Two actions can performed in this page: search and delete tags // Delete action: This will delete a tag @@ -205,6 +207,8 @@ if (!empty($result)) { html_print_table ($table); } +enterprise_hook('close_meta_frame'); + ui_require_css_file ('cluetip'); ui_require_jquery_file ('cluetip'); diff --git a/pandora_console/godmode/users/configure_profile.php b/pandora_console/godmode/users/configure_profile.php index ee7e6f983b..c3d17e743e 100644 --- a/pandora_console/godmode/users/configure_profile.php +++ b/pandora_console/godmode/users/configure_profile.php @@ -54,6 +54,8 @@ else { } +enterprise_hook('open_meta_frame'); + $new_profile = (bool) get_parameter ('new_profile'); $id_profile = (int) get_parameter ('id'); @@ -196,4 +198,7 @@ if ($id_profile || $new_profile) { } echo "
"; } + +enterprise_hook('close_meta_frame'); + ?> diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index 639105bbf0..92e69e3233 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -89,6 +89,8 @@ else { $sec = 'gusuarios'; } +enterprise_hook('open_meta_frame'); + if ($config['user_can_update_info']) { $view_mode = false; } @@ -640,6 +642,9 @@ array_push ($table->data, $data); html_print_table ($table); unset ($table); + +enterprise_hook('close_meta_frame'); + ?>