From fc5cfb3c321efab4c91f4fd10e87df567e4f0757 Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Wed, 22 Oct 2014 11:52:54 +0200 Subject: [PATCH 1/2] Added the function "db_search_in_history_db" --- pandora_console/include/functions_db.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index 7f7fc7dc2d..b8cd3e683f 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -1187,4 +1187,25 @@ function db_get_fields($table) { break; } } + +/** + * @param int Unix timestamp with the date. + * + * @return bool Returns true if the history db has data after the date provided or false otherwise. + */ +function db_search_in_history_db ($utimestamp) { + global $config; + + $search_in_history_db = false; + if ($config['history_db_enabled'] == 1) { + $history_db_start_period = $config['history_db_days'] * SECONDS_1DAY; + + // If the date is newer than the newest history db data + if (time() - $history_db_start_period >= $utimestamp) + $search_in_history_db = true; + } + + return $search_in_history_db; +} + ?> \ No newline at end of file From e89565e760f1a677f283bfeca0c50b83a5922a01 Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Wed, 22 Oct 2014 12:00:14 +0200 Subject: [PATCH 2/2] Modified a bunch of functions to choose when the history db should be used and when not --- pandora_console/include/functions_graph.php | 6 +- pandora_console/include/functions_modules.php | 11 +++- .../include/functions_reporting.php | 57 +++++++++++++------ 3 files changed, 51 insertions(+), 23 deletions(-) diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 5dc4ff4461..d474f61e04 100755 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -495,6 +495,7 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events, // Set variables if ($date == 0) $date = get_system_time(); $datelimit = $date - $period; + $search_in_history_db = db_search_in_history_db($datelimit); $resolution = $config['graph_res'] * 50; //Number of points of the graph $interval = (int) ($period / $resolution); $agent_name = modules_get_agentmodule_agent_name ($agent_module_id); @@ -539,7 +540,7 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events, "utimestamp > $datelimit", "utimestamp < $date", 'order' => 'utimestamp ASC'), - array ('datos', 'utimestamp'), 'AND', true); + array ('datos', 'utimestamp'), 'AND', $search_in_history_db); // Get module warning_min and critical_min $warning_min = db_get_value('min_warning','tagente_modulo','id_agente_modulo',$agent_module_id); @@ -913,6 +914,7 @@ function graphic_combined_module ($module_list, $weight_list, $period, if ($date == 0) $date = get_system_time(); $datelimit = $date - $period; + $search_in_history_db = db_search_in_history_db($datelimit); $resolution = $config['graph_res'] * 50; //Number of points of the graph $interval = (int) ($period / $resolution); @@ -1063,7 +1065,7 @@ function graphic_combined_module ($module_list, $weight_list, $period, "utimestamp > $datelimit", "utimestamp < $date", 'order' => 'utimestamp ASC'), - array ('datos', 'utimestamp'), 'AND', true); + array ('datos', 'utimestamp'), 'AND', $search_in_history_db); if ($data === false) { $data = array (); } diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php index 5627f395a7..82a3075254 100644 --- a/pandora_console/include/functions_modules.php +++ b/pandora_console/include/functions_modules.php @@ -1497,7 +1497,9 @@ function modules_get_previous_data ($id_agent_module, $utimestamp = 0, $string = ORDER BY utimestamp DESC', $id_agent_module, $utimestamp, $utimestamp - SECONDS_2DAY); - return db_get_row_sql ($sql, true); + $search_in_history_db = db_search_in_history_db($utimestamp); + + return db_get_row_sql ($sql, $search_in_history_db); } /** @@ -1529,7 +1531,9 @@ function modules_get_next_data ($id_agent_module, $utimestamp = 0, $string = 0) ORDER BY utimestamp ASC', $id_agent_module, $utimestamp + $interval, $utimestamp); - return db_get_row_sql ($sql, true); + $search_in_history_db = db_search_in_history_db($utimestamp); + + return db_get_row_sql ($sql, $search_in_history_db); } /** @@ -1550,6 +1554,7 @@ function modules_get_agentmodule_data ($id_agent_module, $period, $date = 0) { } $datelimit = $date - $period; + $search_in_history_db = db_search_in_history_db($datelimit); switch ($module['id_tipo_modulo']) { //generic_data_string @@ -1586,7 +1591,7 @@ function modules_get_agentmodule_data ($id_agent_module, $period, $date = 0) { break; } - $values = db_get_all_rows_sql ($sql, true, false); + $values = db_get_all_rows_sql ($sql, $search_in_history_db, false); if ($values === false) { return array (); diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index cd9b12b990..6b144d748a 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -52,6 +52,8 @@ function reporting_get_agentmodule_data_average ($id_agent_module, $period=0, $d // Initialize variables if (empty ($date)) $date = get_system_time (); $datelimit = $date - $period; + + $search_in_history_db = db_search_in_history_db($datelimit); $id_module_type = modules_get_agentmodule_type ($id_agent_module); $module_type = modules_get_moduletype_name ($id_module_type); @@ -63,7 +65,7 @@ function reporting_get_agentmodule_data_average ($id_agent_module, $period=0, $d WHERE id_agente_modulo = ' . (int) $id_agent_module . ' AND utimestamp > ' . (int) $datelimit . ' AND utimestamp < ' . (int) $date . - ' ORDER BY utimestamp ASC', true); + ' ORDER BY utimestamp ASC', $search_in_history_db); if ($interval_data === false) $interval_data = array (); // Uncompressed module data @@ -155,7 +157,9 @@ function reporting_get_agentmodule_data_max ($id_agent_module, $period=0, $date // Initialize variables if (empty ($date)) $date = get_system_time (); $datelimit = $date - $period; - + + $search_in_history_db = db_search_in_history_db($datelimit); + $id_module_type = modules_get_agentmodule_type ($id_agent_module); $module_type = modules_get_moduletype_name ($id_module_type); $uncompressed_module = is_module_uncompressed ($module_type); @@ -166,7 +170,7 @@ function reporting_get_agentmodule_data_max ($id_agent_module, $period=0, $date WHERE id_agente_modulo = ' . (int) $id_agent_module . ' AND utimestamp > ' . (int) $datelimit . ' AND utimestamp < ' . (int) $date . - ' ORDER BY utimestamp ASC', true); + ' ORDER BY utimestamp ASC', $search_in_history_db); if ($interval_data === false) $interval_data = array (); // Uncompressed module data @@ -233,7 +237,9 @@ function reporting_get_agentmodule_data_min ($id_agent_module, $period=0, $date // Initialize variables if (empty ($date)) $date = get_system_time (); - $datelimit = $date - $period; + $datelimit = $date - $period; + + $search_in_history_db = db_search_in_history_db($datelimit); $id_module_type = modules_get_agentmodule_type ($id_agent_module); $module_type = modules_get_moduletype_name ($id_module_type); @@ -245,7 +251,7 @@ function reporting_get_agentmodule_data_min ($id_agent_module, $period=0, $date WHERE id_agente_modulo = ' . (int) $id_agent_module . ' AND utimestamp > ' . (int) $datelimit . ' AND utimestamp < ' . (int) $date . - ' ORDER BY utimestamp ASC', true); + ' ORDER BY utimestamp ASC', $search_in_history_db); if ($interval_data === false) $interval_data = array (); // Uncompressed module data @@ -307,6 +313,8 @@ function reporting_get_agentmodule_data_sum ($id_agent_module, $period=0, $date // Initialize variables if (empty ($date)) $date = get_system_time (); $datelimit = $date - $period; + + $search_in_history_db = db_search_in_history_db($datelimit); $id_module_type = db_get_value ('id_tipo_modulo', 'tagente_modulo','id_agente_modulo', $id_agent_module); $module_name = db_get_value ('nombre', 'ttipo_modulo', 'id_tipo', $id_module_type); @@ -326,7 +334,7 @@ function reporting_get_agentmodule_data_sum ($id_agent_module, $period=0, $date WHERE id_agente_modulo = ' . (int) $id_agent_module . ' AND utimestamp > ' . (int) $datelimit . ' AND utimestamp < ' . (int) $date . - ' ORDER BY utimestamp ASC', true); + ' ORDER BY utimestamp ASC', $search_in_history_db); if ($interval_data === false) $interval_data = array (); // Uncompressed module data @@ -414,6 +422,8 @@ function reporting_get_agentmodule_sla ($id_agent_module, $period = 0, $min_valu } // Limit date to start searching data $datelimit = $date - $period; + + $search_in_history_db = db_search_in_history_db($datelimit); // Get interval data $sql = sprintf ('SELECT * @@ -464,7 +474,7 @@ function reporting_get_agentmodule_sla ($id_agent_module, $period = 0, $min_valu $sql .= ' AND (TIME(FROM_UNIXTIME(utimestamp)) >= "' . $timeFrom . '" OR TIME(FROM_UNIXTIME(utimestamp)) <= "'. $timeTo . '")'; } $sql .= ' ORDER BY utimestamp ASC'; - $interval_data = db_get_all_rows_sql ($sql, true); + $interval_data = db_get_all_rows_sql ($sql, $search_in_history_db); if ($interval_data === false) { $interval_data = array (); @@ -578,6 +588,8 @@ function reporting_get_agentmodule_sla_array ($id_agent_module, $period = 0, $mi } // Limit date to start searching data $datelimit = $date - $period; + + $search_in_history_db = db_search_in_history_db($datelimit); // Get interval data $sql = sprintf ('SELECT * FROM tagente_datos @@ -631,7 +643,7 @@ function reporting_get_agentmodule_sla_array ($id_agent_module, $period = 0, $mi } $sql .= ' ORDER BY utimestamp ASC'; - $interval_data = db_get_all_rows_sql ($sql, true); + $interval_data = db_get_all_rows_sql ($sql, $search_in_history_db); if ($interval_data === false) { $interval_data = array (); @@ -4996,13 +5008,14 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f array_unshift($table2->head, __('Date')); $datelimit = $report["datetime"] - $content['period']; + $search_in_history_db = db_search_in_history_db($datelimit); // This query gets information from the default and the historic database $result = db_get_all_rows_sql('SELECT * FROM tagente_datos WHERE id_agente_modulo = ' . $content['id_agent_module'] . ' AND utimestamp > ' . $datelimit . ' - AND utimestamp <= ' . $report["datetime"], true); + AND utimestamp <= ' . $report["datetime"], $search_in_history_db); // Adds string data if there is no numeric data if ((count($result) < 0) or (!$result)) { @@ -5011,7 +5024,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f FROM tagente_datos_string WHERE id_agente_modulo = ' . $content['id_agent_module'] . ' AND utimestamp > ' . $datelimit . ' - AND utimestamp <= ' . $report["datetime"], true); + AND utimestamp <= ' . $report["datetime"], $search_in_history_db); } if ($result === false) { $result = array(); @@ -7122,7 +7135,9 @@ function reporting_get_agentmodule_mtbf ($id_agent_module, $period = 0, $date = if (empty ($date)) $date = get_system_time (); // Read module configuration - $datelimit = $date - $period; + $datelimit = $date - $period; + $search_in_history_db = db_search_in_history_db($datelimit); + $module = db_get_row_sql ('SELECT max_critical, min_critical, id_tipo_modulo FROM tagente_modulo WHERE id_agente_modulo = ' . (int) $id_agent_module); @@ -7146,7 +7161,7 @@ function reporting_get_agentmodule_mtbf ($id_agent_module, $period = 0, $date = WHERE id_agente_modulo = ' . (int) $id_agent_module . ' AND utimestamp > ' . (int) $datelimit . ' AND utimestamp < ' . (int) $date . - ' ORDER BY utimestamp ASC', true); + ' ORDER BY utimestamp ASC', $search_in_history_db); if ($interval_data === false) $interval_data = array (); // Get previous data @@ -7232,7 +7247,9 @@ function reporting_get_agentmodule_mttr ($id_agent_module, $period = 0, $date = if (empty ($date)) $date = get_system_time (); // Read module configuration - $datelimit = $date - $period; + $datelimit = $date - $period; + $search_in_history_db = db_search_in_history_db($datelimit); + $module = db_get_row_sql ('SELECT max_critical, min_critical, id_tipo_modulo FROM tagente_modulo WHERE id_agente_modulo = ' . (int) $id_agent_module); @@ -7256,7 +7273,7 @@ function reporting_get_agentmodule_mttr ($id_agent_module, $period = 0, $date = WHERE id_agente_modulo = ' . (int) $id_agent_module . ' AND utimestamp > ' . (int) $datelimit . ' AND utimestamp < ' . (int) $date . - ' ORDER BY utimestamp ASC', true); + ' ORDER BY utimestamp ASC', $search_in_history_db); if ($interval_data === false) $interval_data = array (); // Get previous data @@ -7341,7 +7358,9 @@ function reporting_get_agentmodule_tto ($id_agent_module, $period = 0, $date = 0 if (empty ($date)) $date = get_system_time (); // Read module configuration - $datelimit = $date - $period; + $datelimit = $date - $period; + $search_in_history_db = db_search_in_history_db($datelimit); + $module = db_get_row_sql ('SELECT max_critical, min_critical, id_tipo_modulo FROM tagente_modulo WHERE id_agente_modulo = ' . (int) $id_agent_module); @@ -7365,7 +7384,7 @@ function reporting_get_agentmodule_tto ($id_agent_module, $period = 0, $date = 0 WHERE id_agente_modulo = ' . (int) $id_agent_module . ' AND utimestamp > ' . (int) $datelimit . ' AND utimestamp < ' . (int) $date . - ' ORDER BY utimestamp ASC', true); + ' ORDER BY utimestamp ASC', $search_in_history_db); if ($interval_data === false) $interval_data = array (); // Get previous data @@ -7441,7 +7460,9 @@ function reporting_get_agentmodule_ttr ($id_agent_module, $period = 0, $date = 0 if (empty ($date)) $date = get_system_time (); // Read module configuration - $datelimit = $date - $period; + $datelimit = $date - $period; + $search_in_history_db = db_search_in_history_db($datelimit); + $module = db_get_row_sql ('SELECT max_critical, min_critical, id_tipo_modulo FROM tagente_modulo WHERE id_agente_modulo = ' . (int) $id_agent_module); @@ -7465,7 +7486,7 @@ function reporting_get_agentmodule_ttr ($id_agent_module, $period = 0, $date = 0 WHERE id_agente_modulo = ' . (int) $id_agent_module . ' AND utimestamp > ' . (int) $datelimit . ' AND utimestamp < ' . (int) $date . - ' ORDER BY utimestamp ASC', true); + ' ORDER BY utimestamp ASC', $search_in_history_db); if ($interval_data === false) $interval_data = array (); // Get previous data