diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index e0626c1a33..3665391ec3 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2010-03-01 Sancho Lerena + + * include/styles/menu.css, + include/functions_db.php, + operation/menu.php: New code for give support for Metaconsole. Added nocache + settings in some SQL main functions to avoid globally usage of SQL cache. + 2010-03-01 Miguel de Dios * godmode/gis_maps/configure_gis_map.php: fix in javascript function diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index ac5beb0756..204fdcfa19 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -1826,6 +1826,11 @@ function get_db_all_rows_sql ($sql, $search_history_db = false, $cache = true) { global $config; $history = array (); + // To disable globally SQL cache depending on global variable. + // Used in several critical places like Metaconsole trans-server queries + if (isset($config["dbcache"])) + $cache = $config["dbcache"]; + // Read from the history DB if necessary if ($search_history_db) { $cache = false; diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css index b40b030829..2319ec710a 100644 --- a/pandora_console/include/styles/menu.css +++ b/pandora_console/include/styles/menu.css @@ -90,6 +90,9 @@ #icon_oper-dashboard { background-image: url(../../images/house.png); } +#icon_oper-metaconsole { + background-image: url(../../images/application_double.png); +} #icon_oper-agents { background-image: url(../../images/bricks.png); diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index 6aa35bf065..2afe5b30a8 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -28,6 +28,8 @@ $menu['class'] = 'operation'; // Agent read, Server read if (give_acl ($config['id_user'], 0, "AR")) { + enterprise_hook ('metaconsole_menu'); + enterprise_hook ('dashboard_menu'); //View agents