diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql index 111ac54ee0..b51be0a83d 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql @@ -1403,6 +1403,7 @@ CREATE TABLE IF NOT EXISTS `tcontainer_item` ( `agent` varchar(100) NOT NULL default '', `module` varchar(100) NOT NULL default '', `id_tag` integer(10) unsigned NOT NULL DEFAULT 0, + `type_graph` tinyint(1) unsigned NOT NULL DEFAULT 0, PRIMARY KEY(`id_ci`), FOREIGN KEY (`id_container`) REFERENCES tcontainer(`id_container`) ON DELETE CASCADE diff --git a/pandora_console/godmode/reporting/create_container.php b/pandora_console/godmode/reporting/create_container.php index 1ff4ed3aa1..82972733b4 100644 --- a/pandora_console/godmode/reporting/create_container.php +++ b/pandora_console/godmode/reporting/create_container.php @@ -32,72 +32,75 @@ $id_container = get_parameter('id',0); $offset = (int) get_parameter ('offset',0); if (is_ajax()){ - $add_single = (bool) get_parameter('add_single',0); - $add_custom = (bool) get_parameter('add_custom',0); + $add_single = (bool) get_parameter('add_single',0); + $add_custom = (bool) get_parameter('add_custom',0); $add_dynamic = (bool) get_parameter('add_dynamic',0); - $id_container2 = get_parameter('id_container',0); + $id_container2 = get_parameter('id_container',0); - if($add_single){ - $id_agent = get_parameter('id_agent'); - $id_agent_module = get_parameter('id_agent_module'); - $time_lapse = get_parameter('time_lapse'); - $only_avg = get_parameter('only_avg'); - if($only_avg != 'false'){ - $only_avg = 1; - } - else{ - $only_avg = 0; - } - $values = array( - 'id_container' => $id_container2, - 'type' => "simple_graph", - 'id_agent' => $id_agent, - 'id_agent_module' => $id_agent_module, - 'time_lapse' => $time_lapse, - 'only_average' => $only_avg); + if($add_single) { + $id_agent = get_parameter('id_agent'); + $id_agent_module = get_parameter('id_agent_module'); + $time_lapse = get_parameter('time_lapse'); + $only_avg = get_parameter('only_avg'); + $simple_type_graph = get_parameter('simple_type_graph'); + + if($only_avg != 'false'){ + $only_avg = 1; + } else{ + $only_avg = 0; + } + $values = array( + 'id_container' => $id_container2, + 'type' => "simple_graph", + 'id_agent' => $id_agent, + 'id_agent_module' => $id_agent_module, + 'time_lapse' => $time_lapse, + 'only_average' => $only_avg, + 'type_graph' => $simple_type_graph); - $id_item = db_process_sql_insert('tcontainer_item', $values); - return; - } - - if($add_custom){ - $time_lapse = get_parameter('time_lapse'); - $id_custom = get_parameter('id_custom'); - - $values = array( - 'id_container' => $id_container2, - 'type' => "custom_graph", - 'time_lapse' => $time_lapse, - 'id_graph' => $id_custom); - - $id_item = db_process_sql_insert('tcontainer_item', $values); + $id_item = db_process_sql_insert('tcontainer_item', $values); return; - } + } + + if($add_custom) { + $time_lapse = get_parameter('time_lapse'); + $id_custom = get_parameter('id_custom'); + + $values = array( + 'id_container' => $id_container2, + 'type' => "custom_graph", + 'time_lapse' => $time_lapse, + 'id_graph' => $id_custom); + + $id_item = db_process_sql_insert('tcontainer_item', $values); + return; + } if($add_dynamic) { - $time_lapse = get_parameter('time_lapse'); + $time_lapse = get_parameter('time_lapse'); $group = get_parameter('group',0); $module_group= get_parameter('module_group',0); - $agent_alias = get_parameter('agent_alias',''); + $agent_alias = get_parameter('agent_alias',''); $module_name = get_parameter('module_name',''); $tag = get_parameter('tag',0); - $only_avg = get_parameter('only_avg'); - if($only_avg != 'false'){ - $only_avg = 1; - } - else{ - $only_avg = 0; - } + $only_avg = get_parameter('only_avg'); + $simple_type_graph2 = get_parameter('simple_type_graph2'); + if($only_avg != 'false') { + $only_avg = 1; + } else { + $only_avg = 0; + } $values = array( - 'id_container' => $id_container2, - 'type' => "dynamic_graph", + 'id_container' => $id_container2, + 'type' => "dynamic_graph", 'time_lapse' => $time_lapse, - 'id_group' => $group, - 'id_module_group' => $module_group, + 'id_group' => $group, + 'id_module_group' => $module_group, 'agent' => $agent_alias, 'module' => $module_name, - 'id_tag' => $tag, - 'only_average' => $only_avg); + 'id_tag' => $tag, + 'only_average' => $only_avg, + 'type_graph' => $simple_type_graph2); $id_item = db_process_sql_insert('tcontainer_item', $values); return; } @@ -268,6 +271,10 @@ if($edit_container){ $periods[SECONDS_15DAYS] = __('15 days'); $periods[SECONDS_1MONTH] = __('1 month'); + $type_graphs = array(); + $type_graphs[0] = __('Area'); + $type_graphs[1] = __('Line'); + $single_table = ""; $single_table .= ""; $single_table .= ""; $single_table .= ""; + + $single_table .= ""; + $single_table .= ""; + $single_table .= ""; + $single_table .= ""; + $single_table .= ""; $single_table .= ""; @@ -445,6 +462,12 @@ if($edit_container){ $table->data[] = $data; $table->rowclass[] = ''; + $data = array(); + $data[0] = __('Type of graph'); + $data[1] = html_print_select ($type_graphs, 'simple_type_graph2', "","","",0,true); + $table->data[] = $data; + $table->rowclass[] = ''; + $data = array(); $data[0] = __('Only average'); $data[1] = html_print_checkbox('only_avg_2', 1, false,true); @@ -557,27 +580,29 @@ echo html_print_input_hidden('id_agent', 0); $(document).ready (function () { $("input[name=add_single]").click (function () { var id_agent_module = $("#id_agent_module").val(); - if(id_agent_module !== '0'){ - var id_agent = $("#hidden-id_agent").attr('value'); - var time_lapse = $("#hidden-period_single").attr('value'); + if(id_agent_module !== '0'){ + var id_agent = $("#hidden-id_agent").attr('value'); + var time_lapse = $("#hidden-period_single").attr('value'); + var simple_type_graph = $("#simple_type_graph option:selected").attr('value'); var only_avg = $("#checkbox-only_avg").prop("checked"); var id_container = ; - jQuery.post ("ajax.php", - {"page" : "godmode/reporting/create_container", - "add_single" : 1, + jQuery.post ("ajax.php", + {"page" : "godmode/reporting/create_container", + "add_single" : 1, "id_agent" : id_agent, "id_agent_module" : id_agent_module, "time_lapse" : time_lapse, + "simple_type_graph": simple_type_graph, "only_avg" : only_avg, "id_container" : id_container, - }, - function (data, status) { - var url = location.href.replace('&update_container=1', ""); - url = url.replace('&delete_item=1', ""); - location.href = url.replace('&add_container=1', "&id="+id_container); - } + }, + function (data, status) { + var url = location.href.replace('&update_container=1', ""); + url = url.replace('&delete_item=1', ""); + location.href = url.replace('&add_container=1', "&id="+id_container); + } ); - } + } }); @@ -608,9 +633,10 @@ echo html_print_input_hidden('id_agent', 0); var time_lapse = $("#hidden-period_dynamic").attr('value'); var group = $("#container_id_group1").val(); var module_group = $("#combo_modulegroup").val(); + var simple_type_graph2 = $("#simple_type_graph2 option:selected").attr('value'); var tag = $("#tag").val(); - var only_avg = $("#checkbox-only_avg_2").prop("checked"); - var id_container = ; + var only_avg = $("#checkbox-only_avg_2").prop("checked"); + var id_container = ; jQuery.post ("ajax.php", {"page" : "godmode/reporting/create_container", "add_dynamic" : 1, @@ -619,6 +645,7 @@ echo html_print_input_hidden('id_agent', 0); "module_group" : module_group, "agent_alias" : agent_alias, "module_name" : module_name, + "simple_type_graph2": simple_type_graph2, "tag" : tag, "id_container" : id_container, "only_avg" : only_avg, diff --git a/pandora_console/include/ajax/graph.ajax.php b/pandora_console/include/ajax/graph.ajax.php index ac7decf965..114f18bd80 100644 --- a/pandora_console/include/ajax/graph.ajax.php +++ b/pandora_console/include/ajax/graph.ajax.php @@ -156,6 +156,9 @@ if ($get_graphs){ if($period > 1){ $value['time_lapse'] = $period; } + + $type_graph = ($value['type_graph'])? "line" : "area"; + switch ($value['type']) { case 'simple_graph': if ($contador > 0) { @@ -192,7 +195,7 @@ if ($get_graphs){ null, false, false, - 'area'); + $type_graph); $contador --; } // $table .= "
"; @@ -331,7 +334,7 @@ if ($get_graphs){ null, false, false, - 'area'); + $type_graph); $contador --; } } diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index beb53d61d7..fed75d2b8f 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -4231,7 +4231,7 @@ div#footer_help{ left: 90% !important; } -.graph_conteiner_inside > .parent_graph > .noresizevc{ +.graph_conteiner_inside > .parent_graph > .graph{ width: 90% !important; } diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index ba23d05b5d..a694012249 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -604,6 +604,7 @@ CREATE TABLE IF NOT EXISTS `tcontainer_item` ( `agent` varchar(100) NOT NULL default '', `module` varchar(100) NOT NULL default '', `id_tag` integer(10) unsigned NOT NULL DEFAULT 0, + `type_graph` tinyint(1) unsigned NOT NULL DEFAULT 0, PRIMARY KEY(`id_ci`), FOREIGN KEY (`id_container`) REFERENCES tcontainer(`id_container`) ON DELETE CASCADE
"; @@ -328,6 +335,16 @@ if($edit_container){ $single_table .= html_print_checkbox('only_avg', 1, true,true); $single_table .= "
"; + $single_table .= __('Type of graph'); + $single_table .= ""; + $single_table .= html_print_select ($type_graphs, 'simple_type_graph', "","","",0,true); + $single_table .= "
"; $single_table .= "