tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Now the boolean charts is showed as digital signal charts (only with dinamic flot charts engine)

Browse Source
This commit is contained in:
mdtrooper 2015-08-25 13:00:46 +02:00
parent 89d2ddd2dd
commit 3d014c6ab5
4 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/include/functions_graph.php
View File

@ -3102,6 +3102,8 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
$series_type['unknown'.$series_suffix] = 'area';
}
$series_type['sum' . $series_suffix] = 'boolean';
//Boolean graph doesn't have min!!!
/*if (!$avg_only) {
$chart[$timestamp]['min'.$series_suffix] = 0;
@ -3259,6 +3261,7 @@ function grafico_modulo_boolean ($agent_module_id, $period, $show_events,
break;
}
}
grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
$unit_name, $show_alerts, $avg_only, $date, '', '', $show_unknown);
@ -3277,8 +3280,10 @@ function grafico_modulo_boolean ($agent_module_id, $period, $show_events,
$flash_chart = false;
}
$water_mark = array('file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("/images/logo_vertical_water.png", false, false, false));
$water_mark = array(
'file' => $config['homedir'] . "/images/logo_vertical_water.png",
'url' => ui_get_full_url("/images/logo_vertical_water.png",
false, false, false));
if ($compare === 'separated') {
return area_graph($flash_chart, $chart, $width, $height/2, $color, $legend,

13
pandora_console/include/graphs/flot/pandora.flot.js
View File

@ -611,10 +611,17 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
default:
line_show = true;
points_show = false;
steps_chart = false
break;
case 'points':
line_show = false;
points_show = true;
steps_chart = false
break;
case 'boolean':
line_show = true;
points_show = false;
steps_chart = true;
break;
}
@ -661,13 +668,15 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
label: legend[i],
color: serie_color,
//threshold: [{ below: 80, color: "rgb(200, 20, 30)" } , { below: 65, color: "rgb(30, 200, 30)" }, { below: 50, color: "rgb(30, 200, 30)" }],
lines: { show: line_show,
lines: {
show: line_show,
fill: filled,
fillColor: {
colors: [ { opacity: 0.9 }, { opacity: 0.9 } ]
},
lineWidth: WidhtLine,
steps: false },
steps: steps_chart
},
points: { show: points_show }
});