tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added percentile to custom graphs containers

This commit is contained in:
fermin831 2018-04-18 16:01:38 +02:00
parent 292612f765
commit 70bf2dd49f
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/include/ajax/graph.ajax.php
View File

@ -234,7 +234,8 @@ if ($get_graphs){
$height = 300; $height = 300;
} }
$table .= "<div style='width: 90%'><h4>".$graph[0]['name']."</h4><hr></div>"; $table .= "<div style='width: 90%'><h4>".$graph[0]['name']."</h4><hr></div>";
$table .= graphic_combined_module($modules, $table .= graphic_combined_module(
$modules,
$weights, $weights,
$value['time_lapse'], $value['time_lapse'],
1000, 1000,
@ -261,7 +262,7 @@ if ($get_graphs){
$labels, $labels,
false, false,
false, false,
null, true,
false, false,
false, false,
$value['fullscale'] $value['fullscale']

45
pandora_console/include/functions_graph.php
View File

@ -1117,15 +1117,42 @@ function graph_get_formatted_date($timestamp, $format1, $format2) {
* *
* @return Mixed * @return Mixed
*/ */
function graphic_combined_module ($module_list, $weight_list, $period, function graphic_combined_module (
$width, $height, $title, $unit_name, $show_events = 0, $module_list,
$show_alerts = 0, $pure = 0, $stacked = 0, $date = 0, $weight_list,
$only_image = false, $homeurl = '', $ttl = 1, $projection = false, $period,
$prediction_period = false, $background_color = 'white', $width,
$name_list = array(), $unit_list = array(), $show_last = true, $show_max = true, $height,
$show_min = true, $show_avg = true, $labels = array(), $dashboard = false, $title,
$vconsole = false, $percentil = null, $from_interface = false, $unit_name,
$id_widget_dashboard=false, $fullscale = false, $summatory = 0, $average = 0, $modules_series = 0) { $show_events = 0,
$show_alerts = 0,
$pure = 0,
$stacked = 0,
$date = 0,
$only_image = false,
$homeurl = '',
$ttl = 1,
$projection = false,
$prediction_period = false,
$background_color = 'white',
$name_list = array(),
$unit_list = array(),
$show_last = true,
$show_max = true,
$show_min = true,
$show_avg = true,
$labels = array(),
$dashboard = false,
$vconsole = false,
$percentil = null,
$from_interface = false,
$id_widget_dashboard=false,
$fullscale = false,
$summatory = 0,
$average = 0,
$modules_series = 0
) {
global $config; global $config;
global $graphic_type; global $graphic_type;