From c86bd5cc3c7a4a4efc401fd0732fdbf10bf859f5 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Mon, 9 Oct 2017 15:36:28 +0200 Subject: [PATCH] Fix pandora diag texts and delete old secitons files - #1350 --- pandora_console/extras/pandora_diag.php | 12 +- pandora_console/godmode/db/db_audit.php | 110 ------- pandora_console/godmode/db/db_event.php | 94 ------ pandora_console/godmode/db/db_info.php | 36 --- pandora_console/godmode/db/db_purge.php | 356 ----------------------- pandora_console/godmode/db/db_refine.php | 122 -------- 6 files changed, 4 insertions(+), 726 deletions(-) delete mode 100644 pandora_console/godmode/db/db_audit.php delete mode 100644 pandora_console/godmode/db/db_event.php delete mode 100644 pandora_console/godmode/db/db_info.php delete mode 100644 pandora_console/godmode/db/db_purge.php delete mode 100644 pandora_console/godmode/db/db_refine.php diff --git a/pandora_console/extras/pandora_diag.php b/pandora_console/extras/pandora_diag.php index 4f9dc102db..a59d94022e 100644 --- a/pandora_console/extras/pandora_diag.php +++ b/pandora_console/extras/pandora_diag.php @@ -125,7 +125,7 @@ echo " '< ' . $from_date)); - - if ($deleted) - ui_print_success_message(__('Success data deleted')); - else - ui_print_error_message(__('Error deleting data')); -} -# End of get parameters block - -echo ""; -echo ""; -echo ""; - -echo ""; -echo ""; -echo ""; - -echo ""; -echo ""; -echo "
"; -$result = db_get_row_sql ("SELECT COUNT(*) AS total, MIN(fecha) AS first_date, MAX(fecha) AS latest_date FROM tsesion"); - -echo "".__('Total')."".$result["total"]." ".__('Records')."
".__('First date')."".$result["first_date"]."
"; -echo "".__('Latest date')."".$result["latest_date"]."
"; -?> -

-
- - -
- - - - -
-
diff --git a/pandora_console/godmode/db/db_event.php b/pandora_console/godmode/db/db_event.php deleted file mode 100644 index a600e83b7b..0000000000 --- a/pandora_console/godmode/db/db_event.php +++ /dev/null @@ -1,94 +0,0 @@ - '< ' . $from_date)); - - if ($deleted !== false) { - ui_print_success_message(__('Successfully deleted old events')); - } - else { - ui_print_error_message(__('Error deleting old events')); - } -} -# End of get parameters block - -$row = db_get_row_sql (" - SELECT COUNT(*) AS total, - MIN(timestamp) AS first_date, - MAX(timestamp) AS latest_date - FROM tevento"); - -$table = new stdClass(); -$table->data = array (); -$table->cellpadding = 4; -$table->cellspacing = 4; -$table->class = "databox filters"; -$table->width = '100%'; - -$table->data[0][0] = ''.__('Total').':'; -$table->data[0][1] = $row["total"].' '.__('Records'); - -$table->data[1][0] = ''.__('First date').':'; -$table->data[1][1] = $row["first_date"]; - -$table->data[2][0] = ''.__('Latest data').':'; -$table->data[2][1] = $row["latest_date"]; - -html_print_table ($table); -unset ($table); - -echo '

'.__('Purge data').'

'; - -echo '
'; -echo ' -
'; - -$time = get_system_time (); -$fields = array (); -$fields[$time - SECONDS_3MONTHS] = __('Purge event data over 90 days'); -$fields[$time - SECONDS_1MONTH] = __('Purge event data over 30 days'); -$fields[$time - SECONDS_2WEEK] = __('Purge event data over 14 days'); -$fields[$time - SECONDS_1WEEK] = __('Purge event data over 7 days'); -$fields[$time - (SECONDS_1WEEK * 3)] = __('Purge event data over 3 days'); -$fields[$time - SECONDS_1DAY] = __('Purge event data over 1 day'); -$fields[$time] = __('Purge all event data'); - -html_print_select ($fields, "date_purge", '', '', '', '0', false, false, false, "w255"); - -echo ''; -html_print_submit_button (__('Do it!'),'purgedb', false, 'class="sub wand" onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;"'); -echo '
'; -?> diff --git a/pandora_console/godmode/db/db_info.php b/pandora_console/godmode/db/db_info.php deleted file mode 100644 index e694540d99..0000000000 --- a/pandora_console/godmode/db/db_info.php +++ /dev/null @@ -1,36 +0,0 @@ -'.__('Module data received').''; -echo grafico_db_agentes_purge(0, 600, 400); -?> \ No newline at end of file diff --git a/pandora_console/godmode/db/db_purge.php b/pandora_console/godmode/db/db_purge.php deleted file mode 100644 index 571e66487b..0000000000 --- a/pandora_console/godmode/db/db_purge.php +++ /dev/null @@ -1,356 +0,0 @@ -
'; -echo '

' . __('Get data from agent') . '

'; - -// All data (now) -$time["all"] = get_system_time (); -// 1 day ago -$time["1day"] = $time["all"] - SECONDS_1DAY; -// 3 days ago -$time["3day"] = $time["all"] - SECONDS_1DAY * 3; -// 1 week ago -$time["1week"] = $time["all"] - SECONDS_1WEEK; -// 2 weeks ago -$time["2week"] = $time["all"] - SECONDS_1WEEK * 2; -// 1 month ago -$time["1month"] = $time["all"] - SECONDS_1MONTH; -// Three months ago -$time["3month"] = $time["all"] - SECONDS_3MONTHS; - -//Init data -$data["1day"] = 0; -$data["3day"] = 0; -$data["1week"] = 0; -$data["2week"] = 0; -$data["1month"] = 0; -$data["3month"] = 0; -$data["total"] = 0; - - -// Purge data using dates -if (isset($_POST["purgedb"])) { - $from_date = get_parameter_post ("date_purge", 0); - if ($id_agent > 0) { - echo sprintf( - __("Purge task launched for agent %s :: Data older than %s"), - agents_get_name ($id_agent), human_time_description_raw ($from_date)); - echo "

" . - __('Please be patient. This operation can take a long time depending on the amount of modules.') . - "

"; - - $sql = sprintf ("SELECT id_agente_modulo - FROM tagente_modulo - WHERE id_agente = %d", $id_agent); - $result = db_get_all_rows_sql ($sql); - if (empty ($result)) { - $result = array (); - } - - $errors = 0; - $affected = 0; - foreach ($result as $row) { - echo sprintf(__('Deleting records for module %s'), - modules_get_agentmodule_name ($row["id_agente_modulo"])); - echo "
"; - flush (); //Flush here in case there are errors and the script dies, at least we know where we ended - set_time_limit (); //Reset the time limit just in case - - $result = db_process_sql_delete('tagente_datos', - array('id_agente_modulo' => $row["id_agente_modulo"], - 'utimestamp' => '< ' . $from_date)); - - if ($result === false) - $errors++; - else - $affected += $result; - - if ($errors == 0) { - $result = db_process_sql_delete('tagente_datos_inc', - array('id_agente_modulo' => $row["id_agente_modulo"], - 'utimestamp' => '< ' . $from_date)); - - if ($result === false) - $errors++; - else - $affected += $result; - } - if ($errors == 0) { - $result = db_process_sql_delete('tagente_datos_string', - array('id_agente_modulo' => $row["id_agente_modulo"], - 'utimestamp' => '< ' . $from_date)); - - if ($result === false) - $errors++; - else - $affected += $result; - } - if ($errors == 0) { - $result = db_process_sql_delete('tagente_datos_log4x', - array('id_agente_modulo' => $row["id_agente_modulo"], - 'utimestamp' => '< ' . $from_date)); - - if ($result === false) - $errors++; - else - $affected += $result; - } - } - - if ($errors > 0) { - echo sprintf(__('Total errors: %s'), $errors); - echo sprintf(__('Total records deleted: %s'), $affected); - } - else { - echo sprintf(__('Total records deleted: %s'), $affected); - } - } - else { - //All agents - echo __('Deleting records for all agents'); - flush (); - - db_process_sql_delete('tagente_datos', - array('utimestamp' => '< ' . $from_date)); - db_process_sql_delete('tagente_datos_inc', - array('utimestamp' => '< ' . $from_date)); - db_process_sql_delete('tagente_datos_string', - array('utimestamp' => '< ' . $from_date)); - db_process_sql_delete('tagente_datos_log4x', - array('utimestamp' => '< ' . $from_date)); - } - echo "

"; -} - -# Select Agent for further operations. -$agents = agents_get_group_agents (0, true); -$agents[-1] = __('Choose agent'); -$agents[0] = __('All agents'); - -echo '
'; -echo '
'; -html_print_select ($agents, "agent", $id_agent, "this.form.submit();", "", "", false, false, false); -ui_print_help_tip (__("Select the agent you want information about")); -echo '
'; - -if ($id_agent > 0) { - $title = __('Information on agent %s in the database', agents_get_name ($id_agent)); -} -else { - $title = __('Information on all agents in the database'); -} - -echo '

' . $title . '

'; -//Flush before we do some SQL stuff -flush (); - -if ($id_agent > 0) { //If the agent is not All or Not selected - $modules = agents_get_modules ($id_agent); - $query = sprintf (" AND id_agente_modulo IN (%s)", implode (",", array_keys ($modules))); -} -else { - $query = ""; -} - -$data["1day"] = db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos - WHERE utimestamp > %d %s", $time["1day"], $query)); -$data["3day"] = db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos - WHERE utimestamp > %d %s", $time["3day"], $query)); -$data["1week"] = db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos - WHERE utimestamp > %d %s", $time["1week"], $query)); -$data["2week"] = db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos - WHERE utimestamp > %d %s", $time["2week"], $query)); -$data["1month"] = db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos - WHERE utimestamp > %d %s", $time["1month"], $query)); -$data["3month"] = db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos - WHERE utimestamp > %d %s", $time["3month"], $query)); -$data["total"] = db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos - WHERE 1=1 %s", $query)); - -$data["1day"] += db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos_inc - WHERE utimestamp > %d %s", $time["1day"], $query)); -$data["3day"] += db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos_inc - WHERE utimestamp > %d %s", $time["3day"], $query)); -$data["1week"] += db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos_inc - WHERE utimestamp > %d %s", $time["1week"], $query)); -$data["2week"] += db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos_inc - WHERE utimestamp > %d %s", $time["2week"], $query)); -$data["1month"] += db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos_inc - WHERE utimestamp > %d %s", $time["1month"], $query)); -$data["3month"] += db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos_inc - WHERE utimestamp > %d %s", $time["3month"], $query)); -$data["total"] += db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos_inc - WHERE 1=1 %s", $query)); - -$data["1day"] += db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos_string - WHERE utimestamp > %d %s", $time["1day"], $query)); -$data["3day"] += db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos_string - WHERE utimestamp > %d %s", $time["3day"], $query)); -$data["1week"] += db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos_string - WHERE utimestamp > %d %s", $time["1week"], $query)); -$data["2week"] += db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos_string - WHERE utimestamp > %d %s", $time["2week"], $query)); -$data["1month"] += db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos_string - WHERE utimestamp > %d %s", $time["1month"], $query)); -$data["3month"] += db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos_string - WHERE utimestamp > %d %s", $time["3month"], $query)); -$data["total"] += db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos_string - WHERE 1=1 %s", $query)); - -$data["1day"] += db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos_log4x - WHERE utimestamp > %d %s", $time["1day"], $query)); -$data["3day"] += db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos_log4x - WHERE utimestamp > %d %s", $time["3day"], $query)); -$data["1week"] += db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos_log4x - WHERE utimestamp > %d %s", $time["1week"], $query)); -$data["2week"] += db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos_log4x - WHERE utimestamp > %d %s", $time["2week"], $query)); -$data["1month"] += db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos_log4x - WHERE utimestamp > %d %s", $time["1month"], $query)); -$data["3month"] += db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos_log4x - WHERE utimestamp > %d %s", $time["3month"], $query)); -$data["total"] += db_get_sql (sprintf (" - SELECT COUNT(*) - FROM tagente_datos_log4x - WHERE 1=1 %s", $query)); - -$table->width = '98%'; -$table->border = 0; -$table->class = "databox"; - -$table->data[0][0] = __('Packets less than three months old'); -$table->data[0][1] = format_numeric($data["3month"]); -$table->data[1][0] = __('Packets less than one month old'); -$table->data[1][1] = format_numeric($data["1month"]); -$table->data[2][0] = __('Packets less than two weeks old'); -$table->data[2][1] = format_numeric($data["2week"]); -$table->data[3][0] = __('Packets less than one week old'); -$table->data[3][1] = format_numeric($data["1week"]); -$table->data[4][0] = __('Packets less than three days old'); -$table->data[4][1] = format_numeric($data["3day"]); -$table->data[5][0] = __('Packets less than one day old'); -$table->data[5][1] = format_numeric($data["1day"]); -$table->data[6][0] = ''.__('Total number of packets').''; -$table->data[6][1] = ''.format_numeric($data["total"]).''; - -html_print_table ($table); - -echo '
'; -echo '

' . __('Purge data') . '

'; - -$table->data = array (); - -$times = array (); -$times[$time["3month"]] = __('Purge data over 3 months'); -$times[$time["1month"]] = __('Purge data over 1 month'); -$times[$time["2week"]] = __('Purge data over 2 weeks'); -$times[$time["1week"]] = __('Purge data over 1 week'); -$times[$time["3day"]] = __('Purge data over 3 days'); -$times[$time["1day"]] = __('Purge data over 1 day'); -$times[$time["all"]] = __('All data until now'); - -$table->data[0][0] = html_print_select ($times, 'date_purge', '', '', - '', '', true, false, false); -$table->data[0][1] = html_print_submit_button (__('Purge'), "purgedb", - false, 'class="sub wand"', true); - -html_print_table ($table); - -echo ''; -?> diff --git a/pandora_console/godmode/db/db_refine.php b/pandora_console/godmode/db/db_refine.php deleted file mode 100644 index c2ddba0bab..0000000000 --- a/pandora_console/godmode/db/db_refine.php +++ /dev/null @@ -1,122 +0,0 @@ -
".__('Filtering data module')." [".modules_get_agentmodule_name ($id_agentemodulo)."]"; - - if ($config["dbtype"] == 'oracle') { - $sql = sprintf ("DELETE FROM tagente_datos - WHERE id_agente_modulo = %d - AND (datos < TO_BINARY_DOUBLE('%s') - OR datos > TO_BINARY_DOUBLE('%s'))", $id_agentemodulo, $min, $max); - } - else { - $sql = sprintf ("DELETE FROM tagente_datos - WHERE id_agente_modulo = %d - AND (datos < '%s' - OR datos > '%s')", $id_agentemodulo, $min, $max); - } - - db_process_sql ($sql); - } - } //if copy modules or alerts - - echo '

'; - ui_print_success_message(__('Filtering completed')); -} -echo '
'; -echo ""; - -echo '
'; -echo '
'; -echo ''.__('Source agent').'

'; - -$agent_selected = get_parameter_post ("origen", 0); -$agents = agents_get_group_agents (array_keys (users_get_groups ($config["id_user"], "DM"))); - -html_print_select ($agents, "origen", $agent_selected, 'javascript:this.form.update_agent.click();', __('No agent selected'), '0', false, false, false, '', false, 'max-width:300px !important;'); - -echo '  '; - -html_print_submit_button (__('Get Info'), 'update_agent', false, 'style="display:none;"'); - -echo '

'; -echo ''.__('Modules').'

'; - -$module_selected = get_parameter_post ("origen", array ()); -$modules = agents_get_modules ($module_selected, false, 'delete_pending != 1'); - -html_print_select ($modules, "origen_modulo[]", $module_selected, '', '', '0', false, true, false, '', false, 'max-width: 300px !important;'); - -echo '
'; //Left div - -echo '
- '.__('Purge data out of these limits').'

'; -echo ''; -echo ''; -echo '
'; -echo __('Minimum').': '; -echo ''; -html_print_input_text ("min", 0, __('Minimum'), 4, 0, false); -echo '
'; -echo __('Maximum').': '; -echo ''; -html_print_input_text ("max", 0, __('Maximum'), 4, 0, false); -echo '
'; -echo '
'; -echo '
 
'; -html_print_submit_button (__('Delete'), 'eliminar', false, 'class="sub delete" onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;"'); -echo '
'; - -?>