ICMP (pings), - SNMP (detecting the topology of networks and their interfaces), and other customized - type. You can define your own customized recon script.'); ?>
+'Manage monitoring' -> 'Manage custom fields'. "); ?>
diff --git a/pandora_console/general/firts_task/fields_manager.php b/pandora_console/general/firts_task/fields_manager.php index e4be4dfb47..90528cb8a0 100755 --- a/pandora_console/general/firts_task/fields_manager.php +++ b/pandora_console/general/firts_task/fields_manager.php @@ -26,11 +26,8 @@ ui_require_css_file ('firts_task');ICMP (pings), - SNMP (detecting the topology of networks and their interfaces), and other customized - type. You can define your own customized recon script.'); ?>
+'Manage monitoring' -> 'Manage custom fields'. "); ?>
diff --git a/pandora_console/general/firts_task/map_builder.php b/pandora_console/general/firts_task/map_builder.php index 6e16c6d048..705e553447 100755 --- a/pandora_console/general/firts_task/map_builder.php +++ b/pandora_console/general/firts_task/map_builder.php @@ -30,11 +30,11 @@ ui_print_info_message(ICMP (pings), - SNMP (detecting the topology of networks and their interfaces), and other customized - type. You can define your own customized recon script.'); ?>
+
ICMP (pings), - SNMP (detecting the topology of networks and their interfaces), and other customized - type. You can define your own customized recon script.'); ?>
+'Manage SNMP Console' and 'SNMP Filters'. + One trap which is going to run in conjunction with any of them - just the ones for the server are going to get ruled out automatically. "); ?>
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index 1ca451b48e..9295412c48 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -23,7 +23,7 @@ $ag_group = get_parameter ("ag_group_refresh", -1); $sortField = get_parameter('sort_field'); $sort = get_parameter('sort', 'none'); $recursion = get_parameter('recursion'); -$disabled = get_parameter('disabled'); +$disabled = get_parameter('disabled', 0); if ($ag_group == -1 ) $ag_group = (int) get_parameter ("ag_group", -1); diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index e05241a6d7..4f9d9f2d6c 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -225,6 +225,10 @@ $table_simple->data[1][3] = html_print_select_from_sql ('SELECT id_mg, name FROM 'id_module_group', $id_module_group, '', __('Not assigned'), '0', true, false, true, $disabledBecauseInPolicy); +if($disabledBecauseInPolicy){ + $table_simple->data[1][3] .= html_print_input_hidden ('id_module_group', $id_module_group, true); +} + $table_simple->data[2][0] = __('Warning status').' ' . ui_print_help_icon ('warning_status', true); $table_simple->data[2][1] = ''; diff --git a/pandora_console/godmode/agentes/planned_downtime.list.php b/pandora_console/godmode/agentes/planned_downtime.list.php index 592850167a..232ddbd819 100755 --- a/pandora_console/godmode/agentes/planned_downtime.list.php +++ b/pandora_console/godmode/agentes/planned_downtime.list.php @@ -177,26 +177,39 @@ $row[] = html_print_submit_button('Search', 'search', false, 'class="sub search" $table_form->data[] = $row; // End of table filter +// Useful to know if the user has done a form filtering +$filter_performed = false; + $groups = users_get_groups (); if (!empty($groups)) { $where_values = "1=1"; $groups_string = implode (",", array_keys ($groups)); $where_values .= " AND id_group IN ($groups_string)"; + + // WARNING: add $filter_performed = true; to any future filter if (!empty($search_text)) { + $filter_performed = true; + $where_values .= " AND (name LIKE '%$search_text%' OR description LIKE '%$search_text%')"; } if (!empty($execution_type)) { + $filter_performed = true; + $where_values .= " AND type_execution = '$execution_type'"; } if (!empty($date_from)) { + $filter_performed = true; + $where_values .= " AND (type_execution = 'periodically' OR (type_execution = 'once' AND date_from >= '".strtotime("$date_from 00:00:00")."'))"; } if (!empty($date_to)) { + $filter_performed = true; + $periodically_monthly_w = "type_periodicity = 'monthly' AND ((periodically_day_from <= '".date('d', strtotime($date_from))."' AND periodically_day_to >= '".date('d', strtotime($date_to))."') OR (periodically_day_from > periodically_day_to @@ -226,14 +239,20 @@ if (!empty($groups)) { } if (!$show_archived) { + $filter_performed = true; + $where_values .= " AND (type_execution = 'periodically' OR (type_execution = 'once' AND date_to >= '".time()."'))"; } if (!empty($agent_id)) { + $filter_performed = true; + $where_values .= " AND id IN (SELECT id_downtime FROM tplanned_downtime_agents WHERE id_agent = $agent_id)"; } if (!empty($module_id)) { + $filter_performed = true; + $where_values .= " AND (id IN (SELECT id_downtime FROM tplanned_downtime_modules WHERE id_agent_module = $module_id) @@ -322,9 +341,33 @@ else { $downtimes = array(); } -if (!$downtimes) { +// No downtimes cause the user has not anyone +if (!$downtimes && !$filter_performed) { require_once ($config['homedir'] . "/general/firts_task/planned_downtime.php"); } +// No downtimes cause the user performed a search +else if (!$downtimes) { + // Filter form + echo ""; + + // Info message + echo '