From 7c71b83b9a9f7d10a0430de05222bd5387777708 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Fri, 26 Jan 2018 14:43:23 +0100 Subject: [PATCH] Event bar, module list in view, change builder data - #1748 --- .../reporting/cluster_builder.main.php | 4 +- .../godmode/reporting/cluster_builder.php | 18 +- .../godmode/reporting/cluster_view_2.php | 259 ++++++++++++++++-- 3 files changed, 253 insertions(+), 28 deletions(-) diff --git a/pandora_console/godmode/reporting/cluster_builder.main.php b/pandora_console/godmode/reporting/cluster_builder.main.php index eb1a8e97db..6d412ef331 100644 --- a/pandora_console/godmode/reporting/cluster_builder.main.php +++ b/pandora_console/godmode/reporting/cluster_builder.main.php @@ -362,8 +362,8 @@ elseif ($step == 4) { echo ""; echo "".__('Common modules').""; - echo "".__('Critical if more than').""; - echo "".__('Warning if more than').""; + echo "".__('Critical if equal or greater than').""; + echo "".__('Warning if equal or greater than').""; echo "".__('Actions').""; echo ""; diff --git a/pandora_console/godmode/reporting/cluster_builder.php b/pandora_console/godmode/reporting/cluster_builder.php index ffaeb5a689..df083a5da0 100644 --- a/pandora_console/godmode/reporting/cluster_builder.php +++ b/pandora_console/godmode/reporting/cluster_builder.php @@ -181,12 +181,16 @@ elseif ($step == 3) { $id_parent_modulo = db_process_sql('select id_agente_modulo from tagente_modulo where id_agente = '.$id_agent[0]['id_agent'].' and nombre = "Cluster status"'); - $get_module_type = db_process_sql('select id_tipo_modulo,descripcion from tagente_modulo where nombre = "'.$value.'" limit 1'); + $get_module_type = db_process_sql('select id_tipo_modulo,descripcion,min_warning,min_critical from tagente_modulo where nombre = "'.$value.'" limit 1'); $get_module_type_value = $get_module_type[0]['id_tipo_modulo']; $get_module_description_value = $get_module_type[0]['descripcion']; + $get_module_warning_value = $get_module_type[0]['min_warning']; + + $get_module_critical_value = $get_module_type[0]['min_critical']; + $values_module = array( 'nombre' => $value, 'id_modulo' => 5, @@ -197,8 +201,8 @@ elseif ($step == 3) { 'custom_integer_2' =>$tcluster_module, 'id_tipo_modulo' =>$get_module_type_value, 'descripcion' => $get_module_description_value, - 'min_warning' => 1, - 'min_critical' => 2 + 'min_warning' => $get_module_warning_value, + 'min_critical' => $get_module_critical_value ); @@ -248,10 +252,14 @@ elseif ($step == 3) { $critical_values[$value] = get_parameter('critical_item_'.$value,0); $warning_values[$value] = get_parameter('warning_item_'.$value,0); } + + // $get_module_id_limit = db_process_sql('update tagente_modulo set min_critical = '.$value.' where nombre = (select name from tcluster_item where id = '.$key.') and cutom_integer_1 = '.$id_cluster); foreach ($critical_values as $key => $value) { $titem_critical_limit = db_process_sql('update tcluster_item set critical_limit = '.$value.' where id = '.$key); + $get_module_critical_limit = db_process_sql('update tagente_modulo set min_critical = '.$value.' where nombre = (select name from tcluster_item where id = '.$key.') and cutom_integer_1 = '.$id_cluster); + if ($titem_critical_limit !== false){ db_pandora_audit("Report management", "Critical limit #$value assigned to item #$key"); } @@ -264,6 +272,8 @@ elseif ($step == 3) { foreach ($warning_values as $key => $value) { $titem_warning_limit = db_process_sql('update tcluster_item set warning_limit = '.$value.' where id = '.$key); + + $get_module_warning_limit = db_process_sql('update tagente_modulo set min_warning = '.$value.' where nombre = (select name from tcluster_item where id = '.$key.') and cutom_integer_1 = '.$id_cluster); if ($titem_warning_limit !== false){ db_pandora_audit("Report management", "Critical limit #$value assigned to item #$key"); @@ -280,7 +290,7 @@ elseif ($step == 3) { header ("Location: index.php?sec=reporting&sec2=godmode/reporting/cluster_builder&step=5&id_cluster=".$id_cluster); } elseif ($cluster_type[$id_cluster] == 'AA') { - header ("Location: index.php?sec=reporting&sec2=godmode/reporting/cluster_view&id=".$id_cluster); + // header ("Location: index.php?sec=reporting&sec2=godmode/reporting/cluster_view&id=".$id_cluster); } } diff --git a/pandora_console/godmode/reporting/cluster_view_2.php b/pandora_console/godmode/reporting/cluster_view_2.php index 0a2c36aba1..b43b67d159 100644 --- a/pandora_console/godmode/reporting/cluster_view_2.php +++ b/pandora_console/godmode/reporting/cluster_view_2.php @@ -34,15 +34,19 @@ ui_print_page_header ( __("Cluster detail").' ยป '.clusters_get_name($id_cluster echo ""; echo ""; - echo ""; - echo "
"; - echo "
"; + echo "
"; + echo "
"; echo "
"; + echo ""; - echo "
"; + + +echo "
"; + + echo "
"; - echo "
".__('CLUSTER STATUS')."
"; + echo "
".__('CLUSTER STATUS')."
"; $cluster_module = db_process_sql('select id_agente_modulo from tagente_modulo where id_agente = (select id_agent from tcluster where id = '.$id_cluster.') and nombre = "Cluster status"'); @@ -51,32 +55,56 @@ echo ""; switch ($cluster_module_status) { case 1: - echo "
"; + echo "
+ +
+ +
"; break; case 2: - echo "
"; + echo "
+ +
+ +
"; break; case 4: - echo "
"; + echo "
+ +
+ +
"; break; case 3: - echo "
"; + echo "
+ +
+ +
"; break; case 5: - echo "
"; + echo "
+ +
+ +
"; break; case 0: - echo "
"; + echo "
+ +
+ +
"; break; @@ -85,7 +113,7 @@ echo "
"; break; } - echo "
"; + echo "
"; echo "
".__('Balanced modules')."
"; @@ -118,14 +146,14 @@ echo "
"; echo ""; - echo "
"; + echo "
"; $last_update = db_process_sql('select timestamp from tagente_estado where id_agente_modulo = '.$cluster_module[0]['id_agente_modulo']); $last_update_value = $last_update[0]['timestamp']; - echo "
".__('LAST UPDATE')."
"; - echo "
".$last_update_value."
"; + echo "
".__('LAST UPDATE')."
"; + echo "
".$last_update_value."
"; echo "
"; @@ -159,7 +187,10 @@ echo "
"; echo ""; - echo "
"; + + echo "
"; + + echo "
"; $id_agent = db_process_sql('select id_agent from tcluster where id = '.$id_cluster); @@ -219,14 +250,198 @@ echo "
"; echo ""; echo ""; - echo ""; echo ""; echo "
"; - echo "
"; - - - + echo "
"; + echo "
"; echo "
"; echo "
"; -?> \ No newline at end of file +$id_agent = db_process_sql('select id_agent from tcluster where id = '.$id_cluster); + +$id_agent_value = $id_agent[0]['id_agent']; + +ui_require_css_file ('cluetip'); +ui_require_jquery_file ('cluetip'); + +echo ""; + +ui_include_time_picker(); +ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/"); + +?> + + \ No newline at end of file