I am Pandorin, the annoying clippy for Pandora. You could follow my advices for to make common and basic tasks in Pandora.') . + '
+
'
+ );
+ $helps['homepage']['steps'][] = array(
+ 'element'=> '#clippy',
+ 'intro' => __('What task do you want to do?') . '' .
+ html_print_image('images/pandorin.png', true) .
+ '
+ ' . + '
- ' .
+ '
- ' . + "" . + //'' . + __('Monitoring a server Linux/Windows with a pandora agent') . + '' . + ' ' . + '
- ' . __('Monitoring a switch with remote SNMP') . ' ' . + '
- ' . __('Monitoring a Windows server with remote WMI ') . ' ' . + '
'.
+ html_print_checkbox_extended
+ ('clippy_is_annoying', 1, $clippy_is_annoying, false,
+ 'set_clippy_annoying()', '', true) .
+ __('Please the clippy is annoying, I don\'t want see.') .
+ '
'
+ );
+ $helps['homepage']['conf'] = array();
+ $helps['homepage']['conf']['showBullets'] = 0;
+ $helps['homepage']['conf']['showStepNumbers'] = 0;
+ $helps['homepage']['conf']['name_obj_tour'] = 'intro_homepage';
+ $helps['homepage']['conf']['other_js'] = "
+ function show_clippy() {
+ intro_homepage.start();
+ }
+
+ function set_clippy_annoying() {
+ checked = $('input[name=\'clippy_is_annoying\']').is(':checked');
+ intro_homepage.exit();
+
+ if (checked) {
+ document.cookie = 'clippy_is_annoying=1';
+ }
+ else {
+ document.cookie = 'clippy_is_annoying=0';
+ }
+ }
+ ";
+ if ($config['logged']) {
+ $helps['homepage']['conf']['autostart'] = true;
+ }
+ else {
+ $helps['homepage']['conf']['autostart'] = false;
+ }
+
+ if ($config["tutorial_mode"] == 'on_demand') {
+ $helps['homepage']['conf']['autostart'] = false;
+ }
+
+ if ($clippy_is_annoying === 1) {
+ $helps['homepage']['conf']['autostart'] = false;
+ }
+
+ //==================================================================
+
+ clippy_write_javascript_helps_steps($helps);
+}
+?>
\ No newline at end of file
Index: include/help/clippy/godmode_agentes_configurar_agente.php
===================================================================
--- include/help/clippy/godmode_agentes_configurar_agente.php (revision 0)
+++ include/help/clippy/godmode_agentes_configurar_agente.php (revision 10417)
@@ -0,0 +1,126 @@
+ '#clippy',
+ 'intro' => __('Now you must go to modules, don\'t worry I teach you.')
+ );
+ $helps['monitoring_server_step_3']['steps'][] = array(
+ 'element'=> "img[alt='Modules']",
+ 'intro' => __('Please click in this tab.')
+ );
+ $helps['monitoring_server_step_3']['conf'] = array();
+ $helps['monitoring_server_step_3']['conf']['showBullets'] = 0;
+ $helps['monitoring_server_step_3']['conf']['showStepNumbers'] = 0;
+ $helps['monitoring_server_step_3']['conf']['next_help'] = 'monitoring_server_step_4';
+ //==================================================================
+
+
+ //==================================================================
+ //Help tour about the monitoring with a ping (step 4)
+ //------------------------------------------------------------------
+ $helps['monitoring_server_step_4'] = array();
+ $helps['monitoring_server_step_4']['steps'] = array();
+ $helps['monitoring_server_step_4']['steps'][] = array(
+ 'element'=> '#clippy',
+ 'intro' => __('Now you must create the module, don\'t worry I teach you.')
+ );
+ $helps['monitoring_server_step_4']['steps'][] = array(
+ 'element'=> "#moduletype",
+ 'intro' => __('Choose the network server module.')
+ );
+ $helps['monitoring_server_step_4']['steps'][] = array(
+ 'element'=> "input[name='updbutton']",
+ 'intro' => __('And click in this button.')
+ );
+ $helps['monitoring_server_step_4']['conf'] = array();
+ $helps['monitoring_server_step_4']['conf']['showBullets'] = 0;
+ $helps['monitoring_server_step_4']['conf']['showStepNumbers'] = 0;
+ $helps['monitoring_server_step_4']['conf']['next_help'] = 'monitoring_server_step_5';
+ //==================================================================
+
+
+ //==================================================================
+ //Help tour about the monitoring with a ping (step 5)
+ //------------------------------------------------------------------
+ $helps['monitoring_server_step_5'] = array();
+ $helps['monitoring_server_step_5']['steps'] = array();
+ $helps['monitoring_server_step_5']['steps'][] = array(
+ 'element'=> '#clippy',
+ 'intro' => __('Now you must create the module, don\'t worry I teach you.')
+ );
+ $helps['monitoring_server_step_5']['steps'][] = array(
+ 'element'=> '#clippy',
+ 'intro' => __('We are going to fill the form.')
+ );
+ $helps['monitoring_server_step_5']['steps'][] = array(
+ 'element'=> "#network_component_group",
+ 'intro' => __('Please choose the Network Management.')
+ );
+ $helps['monitoring_server_step_5']['steps'][] = array(
+ 'element'=> "#network_component",
+ 'intro' => __('And choose the component with the name "Host Alive".')
+ );
+ $helps['monitoring_server_step_5']['steps'][] = array(
+ 'element'=> "input[name='name']",
+ 'intro' => __('You can change the name.')
+ );
+ $helps['monitoring_server_step_5']['steps'][] = array(
+ 'element'=> "input[name='ip_target']",
+ 'intro' => __('Check if this IP is the address of your machine.')
+ );
+ $helps['monitoring_server_step_5']['steps'][] = array(
+ 'element'=> "input[name='crtbutton']",
+ 'intro' => __('And only to finish it is clicking this button.')
+ );
+ $helps['monitoring_server_step_5']['conf'] = array();
+ $helps['monitoring_server_step_5']['conf']['showBullets'] = 0;
+ $helps['monitoring_server_step_5']['conf']['showStepNumbers'] = 0;
+ $helps['monitoring_server_step_5']['conf']['next_help'] = 'monitoring_server_step_6';
+ //==================================================================
+
+
+ //==================================================================
+ //Help tour about the monitoring with a ping (step 6)
+ //------------------------------------------------------------------
+ $helps['monitoring_server_step_6'] = array();
+ $helps['monitoring_server_step_6']['steps'] = array();
+ $helps['monitoring_server_step_6']['steps'][] = array(
+ 'element'=> '#clippy',
+ 'intro' => __('Now, your module is just created.And the status color is blue.
This meaning of blue status is the module is not executed for first time.
In the next seconds if there is not a problem, the status color will change to red or green.') + ); + $helps['monitoring_server_step_6']['conf'] = array(); + $helps['monitoring_server_step_6']['conf']['showBullets'] = 0; + $helps['monitoring_server_step_6']['conf']['showStepNumbers'] = 0; + //================================================================== + + + clippy_write_javascript_helps_steps($helps, false); +} +?> \ No newline at end of file Index: include/help/clippy/module_unknow.php =================================================================== --- include/help/clippy/module_unknow.php (revision 0) +++ include/help/clippy/module_unknow.php (revision 10417) @@ -0,0 +1,55 @@ + '{clippy}', //The template to replace with the autogenerate id + 'intro' => '
| ' . + __('You have unknown modules in this agent.') . + ' | ' . + '
| ' . + __('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') . + ' | ' . + '
Unknown modules in Pandora
++You may have unknown modules for many reasons. Unknown module is a special status for a module/monitor which means “I dont have recent data for this monitor and I should have data”. A monitor goes to unknown status when doesnt receive nothing in at least its interval (for example, 300 seconds) multiplied by two, in this case, if you doesn't receive nothing in ten minutes, monitor goes to unknown. +
++These are a few cases where you can get unknown modules: +
+-
+
- Your pandora server is down. Restart it, dont forget to check /var/log/pandora/pandora_server.log to see why was down. +
- Your tentacle server is down, and cannot get data from your Pandora FMS agents installed in your remote servers. +
- You have a network problem between your agents and your server. +
- Your pandora fms agent is stopped and is not sending information to your server. +
- Your network is down, or the remote device you are trying to ask is down or changed it's IP address (for example for numerical SNMP remote queries). +
- Your agent is reporting a badly synchronized date. Means reports a timedate in the past and that messup everything. +
- The script / module before works now doesn't, that can be because something is happing in the agent, check it out. +
+Sometimes UNKNOWN status can be useful to monitor, so you can setup alerts on UNKNOWN status to warn you about that. +
\ No newline at end of file Index: include/help/en/help_snmp_alert_field1.php =================================================================== --- include/help/en/help_snmp_alert_field1.php (revision 10314) +++ include/help/en/help_snmp_alert_field1.php (working copy) @@ -14,10 +14,10 @@You can use these macros in FieldX (1-10) of any alert
-_DATA_: Full trap
-_AGENT_: Agent name
-_IP_: IP Address
-_TIMESTAMP_: Trap date
-_SNMP_OID_: Trap OID
-_SNMP_VALUE_: Trap OID value
+_data_: Full trap
+_agent_: Agent name
+_address_: IP Address
+_timestamp_: Trap date
+_snmp_oid_: Trap OID
+_snmp_value_: Trap OID value
Index: include/help/es/help_snmp_alert_field1.php =================================================================== --- include/help/es/help_snmp_alert_field1.php (revision 10314) +++ include/help/es/help_snmp_alert_field1.php (working copy) @@ -14,10 +14,10 @@
Puede usar esas macros en los campos FieldX (1-10) de cualquier alerta.
-_DATA_: Trap entero
-_AGENT_: Nombre del Agente
-_IP_: Dirección IP
-_TIMESTAMP_: Fecha trap
-_SNMP_OID_: OID del trap
-_SNMP_VALUE_: Valor del OID del trap
+_data_: Trap entero
+_agent_: Nombre del Agente
+_address_: Dirección IP
+_timestamp_: Fecha trap
+_snmp_oid_: OID del trap
+_snmp_value_: Valor del OID del trap
Index: include/help/ja/help_snmp_alert_field1.php =================================================================== --- include/help/ja/help_snmp_alert_field1.php (revision 10314) +++ include/help/ja/help_snmp_alert_field1.php (working copy) @@ -7,10 +7,17 @@
データフィールドがある場合、アラートでそれを利用する必要があります。この目的のために、特別な _snmp_fX_ というマクロを利用できます。これらのマクロは、SNMP トラップアラート以外では無効です。
-
+
メッセージを生成するには、フィールド1に次のような設定をします。
-
-Chassis Alert: _snmp_f2_ in device _snmp_f1_
-
-これらのマクロは、任意のアラートのフィールドX (1 から 10) で利用できます。
+
+ Chassis Alert: _snmp_f2_ in device _snmp_f1_
+
+任意のアラートのフィールドX (1 から 10) で以下のマクロを利用できます。
+
+_data_: トラップ全体
+_agent_: エージェント名
+_address_: IP アドレス
+_timestamp_: トラップのタイムスタンプ
+_snmp_oid_: トラップの OID
+_snmp_value_: トラップ OID の値
"; Index: extensions/module_groups.php =================================================================== --- extensions/module_groups.php (revision 10314) +++ extensions/module_groups.php (working copy) @@ -141,7 +141,8 @@ GROUP BY estado"; break; case "postgresql": - $sql = "SELECT COUNT(id_agente) AS count, case utimestamp when 0 then 5 else estado end as estado + $sql = "SELECT COUNT(id_agente) AS count, + case utimestamp when 0 then 5 else estado end as estado FROM tagente_estado WHERE id_agente IN (SELECT id_agente FROM tagente WHERE id_grupo = %d AND disabled = 0) @@ -149,7 +150,7 @@ (SELECT id_agente_modulo FROM tagente_modulo WHERE id_module_group = %d AND disabled = 0 AND delete_pending = 0) - GROUP BY estado"; + GROUP BY estado, utimestamp"; break; case "oracle": $sql = "SELECT COUNT(id_agente) AS count, case when utimestamp = 0 then 5 else estado end estado @@ -185,7 +186,8 @@ //Metaobject use in html_print_table $table = null; $table->align[0] = 'right'; //Align to right the first column. - $table->style[0] = 'color: #ffffff; background-color: #778866; font-weight: bolder;'; + $table->style[0] = 'color: #ffffff; '. + 'background-color: #778866; font-weight: bolder;'; $table->head = $head; $table->width = '98%'; @@ -201,7 +203,7 @@ foreach ($modelGroups as $idModelGroup => $modelGroup) { $fired = false; - $query = sprintf($sql,$idAgentGroup, $idModelGroup); + $query = sprintf($sql, $idAgentGroup, $idModelGroup); $rowsDB = db_get_all_rows_sql ($query); Index: extensions/files_repo.php =================================================================== --- extensions/files_repo.php (revision 10314) +++ extensions/files_repo.php (working copy) @@ -18,12 +18,14 @@ function pandora_files_repo_install () { global $config; + if (isset($config['files_repo_installed'])) { if ($config['files_repo_installed'] == 1) { return; } } - + + $full_extensions_dir = $config['homedir']."/".EXTENSIONS_DIR."/"; $full_sql_dir = $full_extensions_dir."files_repo/sql/"; @@ -40,6 +42,7 @@ break; } + foreach ($sentences as $sentence) { if (trim ($sentence) == "") continue; @@ -61,22 +64,22 @@ switch ($config["dbtype"]) { case "mysql": - db_process_sql ('DROP TABLE `tfiles_repo_group`'); - db_process_sql ('DROP TABLE `tfiles_repo`'); - db_process_sql ('DELETE FROM `tconfig` - WHERE `token` LIKE "files_repo_%"'); + db_process_sql('DROP TABLE `tfiles_repo_group`'); + db_process_sql('DROP TABLE `tfiles_repo`'); + db_process_sql('DELETE FROM `tconfig` + WHERE `token` LIKE "files_repo_%"'); break; case "postgresql": - db_process_sql ('DROP TABLE `tfiles_repo_group`'); - db_process_sql ('DROP TABLE `tfiles_repo`'); - db_process_sql ('DELETE FROM "tconfig" - WHERE "token" LIKE \'files_repo_%\''); + db_process_sql('DROP TABLE "tfiles_repo_group"'); + db_process_sql('DROP TABLE "tfiles_repo"'); + db_process_sql('DELETE FROM "tconfig" + WHERE "token" LIKE \'files_repo_%\''); break; case "oracle": - db_process_sql ('DROP TABLE `tfiles_repo_group`'); - db_process_sql ('DROP TABLE `tfiles_repo`'); - db_process_sql ('DELETE FROM tconfig - WHERE token LIKE \'files_repo_%\''); + db_process_sql('DROP TABLE "tfiles_repo_group"'); + db_process_sql('DROP TABLE "tfiles_repo"'); + db_process_sql('DELETE FROM tconfig + WHERE token LIKE \'files_repo_%\''); break; } @@ -86,11 +89,11 @@ function pandora_files_repo_godmode () { global $config; - + if (!isset($config['files_repo_installed']) || !$config['files_repo_installed']) { ui_print_error_message(__('Extension not installed')); } - + // ACL Check check_login (); if (! check_acl ($config['id_user'], 0, "PM")) { @@ -98,37 +101,41 @@ require ("general/noaccess.php"); return; } - + // Header tabs $godmode['text'] = '' . html_print_image ("images/setup.png", true, array ("title" => __('Administration view'))) . ""; $godmode['godmode'] = 1; $godmode['active'] = 1; - + $operation['text'] = '' . html_print_image ("images/operation.png", true, array ("title" => __('Operation view'))) . ""; $operation['operation'] = 1; - + $onheader = array('godmode' => $godmode, 'operation' => $operation); // Header ui_print_page_header (__("Files repository manager"), "images/extensions.png", false, "", true, $onheader); - + $full_extensions_dir = $config['homedir']."/".EXTENSIONS_DIR."/"; - require_once ($full_extensions_dir."files_repo/functions_files_repo.php"); - + require_once ($full_extensions_dir . "files_repo/functions_files_repo.php"); + // Directory files_repo check if (!files_repo_check_directory(true)) { return; } - + + $server_content_length = 0; + if (isset($_SERVER['CONTENT_LENGTH'])) + $server_content_length = $_SERVER['CONTENT_LENGTH']; + // Check for an anoying error that causes the $_POST and $_FILES arrays // were empty if the file is larger than the post_max_size - if (intval($_SERVER['CONTENT_LENGTH']) > 0 && empty($_POST)) { + if (intval($server_content_length) > 0 && empty($_POST)) { ui_print_error_message(__('The file exceeds the maximum size')); } - + // GET and POST parameters $file_id = (int) get_parameter ("file_id"); $add_file = (bool) get_parameter ("add_file"); @@ -144,7 +151,7 @@ $description = mb_substr($description, 0, 200, "UTF-8"); } $description = io_safe_input($description); - + if ($add_file) { $result = files_repo_add_file("upfile", $description, $groups, $public); } elseif ($update_file) { @@ -163,7 +170,7 @@ } $file_id = 0; } - + // FORM require ($full_extensions_dir."files_repo/files_repo_form.php"); if (!$file_id) { @@ -175,7 +182,7 @@ function pandora_files_repo_operation () { global $config; - + // Header tabs $onheader = array(); if (check_acl($config['id_user'], 0, "PM")) { @@ -194,18 +201,19 @@ } // Header ui_print_page_header (__("Files repository"), "images/extensions.png", false, "", false, $onheader); - + $full_extensions_dir = $config['homedir']."/".EXTENSIONS_DIR."/"; require_once ($full_extensions_dir."files_repo/functions_files_repo.php"); - + // Directory files_repo check if (!files_repo_check_directory(true)) { return; } - + // LIST $full_extensions_dir = $config['homedir']."/".EXTENSIONS_DIR."/"; - require ($full_extensions_dir."files_repo/files_repo_list.php"); + + require ($full_extensions_dir . "files_repo/files_repo_list.php"); } extensions_add_operation_menu_option(__('Files repository'), null, null, "v1r1"); Index: operation/incidents/incident.php =================================================================== --- operation/incidents/incident.php (revision 10314) +++ operation/incidents/incident.php (working copy) @@ -25,7 +25,8 @@ } // Header -ui_print_page_header (__('Incident management'), "images/book_edit.png", false, "", false, ""); +ui_print_page_header (__('Incident management'), + "images/book_edit.png", false, "", false, ""); // Take input parameters @@ -197,7 +198,7 @@ ORDER BY actualizacion DESC OFFSET ".$offset." LIMIT ".$config["block_size"]; $count_sql = "SELECT count(*) FROM tincidencia WHERE id_grupo IN (".implode (",",array_keys ($groups)).")".$filter; - breka; + break; } $result = db_get_all_rows_sql ($sql); @@ -250,11 +251,14 @@ $agents_incidents = array(); } -foreach ($agents_incidents as $agent_incident){ +$result_agent_incidents = array(); +foreach ($agents_incidents as $agent_incident) { $result_agent_incidents[$agent_incident['id_agente']] = $agent_incident['nombre']; } -html_print_select ($result_agent_incidents, "agent_search", $agent_search, 'javascript:this.form.submit();', __('All agents'), "", false, false, false, "w155"); +html_print_select ($result_agent_incidents, "agent_search", + $agent_search, 'javascript:this.form.submit();', __('All agents'), + "", false, false, false, "w155"); echo '
");
- $('#tree_div'+id_father+'_'+type+'_'+div_id).show('normal');
+ $('#tree_div' + id_father + '_' + type + '_' + div_id)
+ .html("");
+ $('#tree_div' + id_father + '_' + type + '_' + div_id)
+ .show('normal');
$('#tree_div'+id_father+'_'+type+'_'+div_id).attr('loadDiv', 2);
$.ajax({
Index: operation/search_modules.getdata.php
===================================================================
--- operation/search_modules.getdata.php (revision 10314)
+++ operation/search_modules.getdata.php (working copy)
@@ -108,7 +108,7 @@
)
)
) AND
- t1.nombre COLLATE utf8_general_ci LIKE \'%' . $stringSearchSQL . '%\' OR
+ t1.nombre LIKE \'%' . $stringSearchSQL . '%\' OR
t3.nombre LIKE \'%' . $stringSearchSQL . '%\'';
break;
case "oracle":
Index: operation/search_main.php
===================================================================
--- operation/search_main.php (revision 10314)
+++ operation/search_main.php (working copy)
@@ -44,6 +44,7 @@
$table->style[9] = 'font-weight: bold; text-align: center;';
$table->style[10] = 'font-weight: bold; text-align: center;';
$table->style[11] = 'font-weight: bold; text-align: center;';
+$table->style[13] = 'font-weight: bold; text-align: center;';
$table->data[0][0] = html_print_image ("images/agent.png", true, array ("title" => __('Agents found')));
$table->data[0][1] = "" .
Index: operation/events/events_list.php
===================================================================
--- operation/events/events_list.php (revision 10314)
+++ operation/events/events_list.php (working copy)
@@ -52,7 +52,7 @@
$event_filter['tag_with'] = base64_encode(io_safe_output($event_filter['tag_with']));
$event_filter['tag_without'] = base64_encode(io_safe_output($event_filter['tag_without']));
- echo json_encode($event_filter);
+ echo io_json_mb_encode($event_filter);
}
// Saves an event filter
@@ -69,8 +69,8 @@
$values['event_view_hr'] = get_parameter('event_view_hr');
$values['id_user_ack'] = get_parameter('id_user_ack');
$values['group_rep'] = get_parameter('group_rep');
- $values['tag_with'] = get_parameter('tag_with', json_encode(array()));
- $values['tag_without'] = get_parameter('tag_without', json_encode(array()));
+ $values['tag_with'] = get_parameter('tag_with', io_json_mb_encode(array()));
+ $values['tag_without'] = get_parameter('tag_without', io_json_mb_encode(array()));
$values['filter_only_alert'] = get_parameter('filter_only_alert');
$values['id_group_filter'] = get_parameter('id_group_filter');
@@ -97,8 +97,8 @@
$values['event_view_hr'] = get_parameter('event_view_hr');
$values['id_user_ack'] = get_parameter('id_user_ack');
$values['group_rep'] = get_parameter('group_rep');
- $values['tag_with'] = get_parameter('tag_with', json_encode(array()));
- $values['tag_without'] = get_parameter('tag_without', json_encode(array()));
+ $values['tag_with'] = get_parameter('tag_with', io_json_mb_encode(array()));
+ $values['tag_without'] = get_parameter('tag_without', io_json_mb_encode(array()));
$values['filter_only_alert'] = get_parameter('filter_only_alert');
$values['id_group_filter'] = get_parameter('id_group_filter');
@@ -116,7 +116,7 @@
if ($get_event_filters) {
$event_filter = events_get_event_filter_select();
- echo json_encode($event_filter);
+ echo io_json_mb_encode($event_filter);
}
return;
@@ -195,14 +195,14 @@
$table->class = 'databox';
$table->styleTable = 'font-weight: bold; color: #555; text-align:left;';
$table->style[0] = 'width: 50%; width:50%;';
-
+
$data = array();
$table->rowid[0] = 'update_save_selector';
$data[0] = html_print_radio_button('filter_mode', 'new', '', true, true) . __('New filter') . ''; $data[1] = html_print_radio_button('filter_mode', 'update', '', false, true) . __('Update filter') . '
'; $table->data[] = $data; $table->rowclass[] = ''; - + $data = array(); $table->rowid[1] = 'save_filter_row1'; $data[0] = __('Filter name') . '
'; @@ -212,7 +212,7 @@ $data[1] .= html_print_select_groups($config["id_user"], "ER", users_can_manage_group_all(), 'id_group', $id_group, '', '', 0, true, false, false, 'w130'); $table->data[] = $data; $table->rowclass[] = ''; - + $data = array(); $table->rowid[2] = 'save_filter_row2'; $data[0] = html_print_submit_button (__('Save filter'), 'save_filter', false, 'class="sub upd"', true); @@ -220,18 +220,18 @@ $table->cellstyle[2][0] = 'text-align:right;'; $table->data[] = $data; $table->rowclass[] = ''; - + $data = array(); $table->rowid[3] = 'update_filter_row1'; $data[0] = __("Overwrite filter") . '
'; # Fix : Only admin user can see filters of group ALL for update $_filters_update = events_get_event_filter_select(false); - + $data[0] .= html_print_select ($_filters_update, "overwrite_filter", '', '', '', 0, true); $data[1] = html_print_submit_button (__('Update filter'), 'update_filter', false, 'class="sub upd"', true); $table->data[] = $data; $table->rowclass[] = ''; - + html_print_table($table); unset($table); echo ''; @@ -340,7 +340,7 @@ if ($open_filter) { $events_filter .= html_print_input_hidden('open_filter', 'true', true); } -else{ +else { $events_filter .= html_print_input_hidden('open_filter', 'false', true); } @@ -414,8 +414,18 @@ $table_advanced->rowclass[] = ''; $data = array(); -$data[0] = ''; -$data[1] = ''; +$data[0] = ''; +$data[1] = ''; $table_advanced->data[] = $data; $table_advanced->rowclass[] = ''; @@ -536,9 +546,15 @@ //Extract the events by filter (or not) from db $result = db_get_all_rows_sql ($sql); + } else { - $result = events_get_events_grouped($sql_post, $offset, $pagination, $meta, $history); + $result = events_get_events_grouped( + $sql_post, + $offset, + $pagination, + $meta, + $history); } if (!empty($result)) { Index: operation/events/events.php =================================================================== --- operation/events/events.php (revision 10314) +++ operation/events/events.php (working copy) @@ -172,7 +172,7 @@ $return = array('fired' => 0); } - echo json_encode($return); + echo io_json_mb_encode($return); } return; Index: operation/search_agents.getdata.php =================================================================== --- operation/search_agents.getdata.php (revision 10314) +++ operation/search_agents.getdata.php (working copy) @@ -173,7 +173,7 @@ AND ( t1.nombre LIKE '%%" . $stringSearchSQL . "%%' OR t2.nombre LIKE '%%" . $stringSearchSQL . "%%' OR - t1.direction LIKE '%%" . $stringSearchSQL . "%%' + t1.direccion LIKE '%%" . $stringSearchSQL . "%%' ) "; break; Index: operation/search_results.php =================================================================== --- operation/search_results.php (revision 10314) +++ operation/search_results.php (working copy) @@ -58,7 +58,9 @@ if ($searchMain) { $main_tab = array('text' => "" - . html_print_image ("images/zoom_mc.png", true, array ("title" => __('Global search'))) . "", 'active' => $searchTab == "main"); + . html_print_image ("images/zoom_mc.png", true, + array ("title" => __('Global search'))) . "", + 'active' => $searchTab == "main"); } else { $main_tab = ''; @@ -66,7 +68,9 @@ if ($searchAgents) { $agents_tab = array('text' => "" - . html_print_image ("images/op_monitoring.png", true, array ("title" => __('Agents'))) . "", 'active' => $searchTab == "agents"); + . html_print_image ("images/op_monitoring.png", true, + array ("title" => __('Agents'))) . "", + 'active' => $searchTab == "agents"); } else { $agents_tab = ''; @@ -74,7 +78,9 @@ if ($searchUsers) { $users_tab = array('text' => "" - . html_print_image ("images/op_workspace.png", true, array ("title" => __('Users'))) . "", 'active' => $searchTab == "users"); + . html_print_image ("images/op_workspace.png", true, + array ("title" => __('Users'))) . "", + 'active' => $searchTab == "users"); } else { $users_tab = ''; @@ -82,7 +88,9 @@ if ($searchAlerts) { $alerts_tab = array('text' => "" - . html_print_image ("images/op_alerts.png", true, array ("title" => __('Alerts'))) . "", 'active' => $searchTab == "alerts"); + . html_print_image ("images/op_alerts.png", true, + array ("title" => __('Alerts'))) . "", + 'active' => $searchTab == "alerts"); } else { $alerts_tab = ''; @@ -90,7 +98,9 @@ if ($searchGraphs) { $graphs_tab = array('text' => "" - . html_print_image ("images/chart.png", true, array ("title" => __('Graphs'))) . "", 'active' => $searchTab == "graphs"); + . html_print_image ("images/chart.png", true, + array ("title" => __('Graphs'))) . "", + 'active' => $searchTab == "graphs"); } else { $graphs_tab = ''; @@ -98,7 +108,9 @@ if ($searchReports) { $reports_tab = array('text' => "" - . html_print_image ("images/op_reporting.png", true, array ("title" => __('Reports'))) . "", 'active' => $searchTab == "reports"); + . html_print_image ("images/op_reporting.png", true, + array ("title" => __('Reports'))) . "", + 'active' => $searchTab == "reports"); } else { $reports_tab = ''; @@ -106,7 +118,9 @@ if ($searchMaps) { $maps_tab = array('text' => "" - . html_print_image ("images/visual_console.png", true, array ("title" => __('Maps'))) . "", 'active' => $searchTab == "maps"); + . html_print_image ("images/visual_console.png", true, + array ("title" => __('Maps'))) . "", + 'active' => $searchTab == "maps"); } else { $maps_tab = ''; @@ -114,7 +128,9 @@ if ($searchModules) { $modules_tab = array('text' => "" - . html_print_image ("images/brick.png", true, array ("title" => __('Modules'))) . "", 'active' => $searchTab == "modules"); + . html_print_image ("images/brick.png", true, + array ("title" => __('Modules'))) . "", + 'active' => $searchTab == "modules"); } else { $modules_tab = ''; @@ -135,6 +151,7 @@ switch ($searchTab) { case 'main': $only_count = true; + require_once('search_agents.getdata.php'); require_once('search_agents.php'); require_once('search_users.getdata.php'); Index: operation/agentes/status_monitor.php =================================================================== --- operation/agentes/status_monitor.php (revision 10314) +++ operation/agentes/status_monitor.php (working copy) @@ -14,8 +14,6 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. - - // Load global vars global $config; @@ -45,6 +43,8 @@ ui_meta_print_header(__("Monitor view")); } + + $ag_freestring = get_parameter ('ag_freestring'); $ag_modulename = (string) get_parameter ('ag_modulename'); if (!defined('METACONSOLE')) { @@ -101,9 +101,13 @@ $sql_conditions = " AND tagente_modulo.disabled = 0 AND tagente.disabled = 0"; +if (is_numeric($ag_group)) { + $id_ag_group = 0; +} +else { + $id_ag_group = db_get_value('id_grupo', 'tgrupo', 'nombre', $ag_group); +} -$id_ag_group = db_get_value('id_grupo', 'tgrupo', 'nombre', $ag_group); - // Agent group selector if (!defined('METACONSOLE')) { if ($ag_group > 0 && check_acl ($config["id_user"], $ag_group, "AR")) { @@ -123,6 +127,7 @@ $sql_conditions_group = " AND tagente.id_grupo IN (".$user_groups.")"; } } + // Module group if (defined('METACONSOLE')) { if ($modulegroup != '-1') @@ -198,7 +203,7 @@ WHERE ttag_module.id_tag IN (SELECT id_tag FROM ttag where name LIKE '%" . $tag_filter . "%') )"; } - else{ + else { $sql_conditions .= " AND tagente_modulo.id_agente_modulo IN ( SELECT ttag_module.id_agente_modulo FROM ttag_module @@ -310,7 +315,9 @@ if (defined('METACONSOLE')) { // For each server defined and not disabled: - $servers = db_get_all_rows_sql ("SELECT * FROM tmetaconsole_setup WHERE disabled = 0"); + $servers = db_get_all_rows_sql ("SELECT * + FROM tmetaconsole_setup + WHERE disabled = 0"); if ($servers === false) $servers = array(); @@ -727,8 +734,15 @@ LIMIT ".$offset.",".$limit_sql; break; case "postgresql": + if (strstr($config['dbversion'], "8.4") !== false) { + $string_agg = "array_to_string(array_agg(ttag.name), ',')"; + } + else { + $string_agg = "STRING_AGG(ttag.name, ',')"; + } + $sql = "SELECT - (SELECT STRING_AGG(ttag.name, ',') + (SELECT " . $string_agg . " FROM ttag WHERE ttag.id_tag IN ( SELECT ttag_module.id_tag @@ -760,7 +774,10 @@ tagente_modulo.critical_instructions, tagente_modulo.warning_instructions, tagente_modulo.unknown_instructions, - tagente_estado.utimestamp AS utimestamp".$sql_form . $sql_conditions_all." LIMIT " . $limit_sql . " OFFSET " . $offset; + tagente_estado.utimestamp AS utimestamp" . + $sql_from . + $sql_conditions_all . + " LIMIT " . $limit_sql . " OFFSET " . $offset; break; case "oracle": $set = array(); @@ -799,7 +816,9 @@ tagente_modulo.critical_instructions, tagente_modulo.warning_instructions, tagente_modulo.unknown_instructions, - tagente_estado.utimestamp AS utimestamp" . $sql_form . $sql_conditions_all; + tagente_estado.utimestamp AS utimestamp" . + $sql_from . + $sql_conditions_all; $sql = oracle_recode_query ($sql, $set); break; } Index: operation/agentes/alerts_status.php =================================================================== --- operation/agentes/alerts_status.php (revision 10314) +++ operation/agentes/alerts_status.php (working copy) @@ -258,7 +258,8 @@ $alerts = array(); -$options_simple = array('offset' => $offset_simple, 'limit' => $config['block_size'], 'order' => $order); +$options_simple = array('offset' => $offset_simple, + 'limit' => $config['block_size'], 'order' => $order); $filter_alert = array(); if($filter_standby == 'standby_on') { @@ -322,11 +323,11 @@ } if ($tab != null) { - $url = $url.'&tab='.$tab; + $url = $url.'&tab=' . $tab; } if ($pure) { - $url .= '&pure='.$pure; + $url .= '&pure=' . $pure; } // Filter form @@ -345,13 +346,17 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) { if ($print_agent) { if (!defined('METACONSOLE')) { - $table->head[0] = "" . __('P.') . ""; + $table->head[0] = "" . + __('P.') . ""; } - $table->head[1] = "" . __('S.') . ""; + $table->head[1] = "" . + __('S.') . ""; if (!defined('METACONSOLE')) { - $table->head[2] = "" . __('F.') . ""; + $table->head[2] = + "" . + __('F.') . ""; } $table->head[3] = __('Agent'); @@ -481,6 +486,12 @@ } } + +if ($sortField) { + $url .= '&sort_field=' . $sortField; + $url .= '&sort=' . $sort; +} + $table->data = array (); $rowPair = true; @@ -496,9 +507,10 @@ } if (!empty ($table->data)) { - echo ''; echo '