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

fixed errors

Browse Source
This commit is contained in:
daniel 2018-02-28 10:02:06 +01:00
parent 7b47ea4c32
commit 3910b455ca
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_graph.php
View File

@ -583,6 +583,8 @@ function grafico_modulo_sparse_data(
$series_type['percentil' . $series_suffix] = 'percentil'; $series_type['percentil' . $series_suffix] = 'percentil';
$array_events_alerts[$series_suffix] = $events; $array_events_alerts[$series_suffix] = $events;
$data_module_graph['series_suffix'] = $series_suffix;
} }
function grafico_modulo_sparse ($agent_module_id, $period, $show_events, function grafico_modulo_sparse ($agent_module_id, $period, $show_events,

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

@ -1144,6 +1144,7 @@ function pandoraFlotArea(
var dashboard = show_elements_graph.dashboard; var dashboard = show_elements_graph.dashboard;
var menu = show_elements_graph.menu; var menu = show_elements_graph.menu;
var max_x = date_array['final_date'] *1000; var max_x = date_array['final_date'] *1000;
var s_suffix = data_module_graph['series_suffix'];
//for threshold //for threshold
var threshold = true; var threshold = true;
@ -1192,12 +1193,19 @@ function pandoraFlotArea(
i=0; i=0;
$.each(values, function (index, value) { $.each(values, function (index, value) {
if (typeof value.data !== "undefined") { if (typeof value.data !== "undefined") {
if(index == 'alert') { console.log(index);
console.log(s_suffix);
if(index == 'alert' + s_suffix) {
console.log('entra');
fill_color = '#ffff00'; fill_color = '#ffff00';
} }
else if(index == 'events') { else if(index == 'event' + s_suffix) {
console.log('entra2');
fill_color = '#ff66cc'; fill_color = '#ff66cc';
} }
else{
fill_color = '';
}
switch (series_type[index]) { switch (series_type[index]) {
case 'area': case 'area':
line_show = true; line_show = true;
@ -1205,7 +1213,7 @@ function pandoraFlotArea(
filled = 0.2; filled = 0.2;
steps_chart = false; steps_chart = false;
radius = false; radius = false;
fill_points = ''; fill_points = fill_color;
break; break;
case 'percentil': case 'percentil':
case 'line': case 'line':
@ -1215,7 +1223,7 @@ function pandoraFlotArea(
filled = false; filled = false;
steps_chart = false; steps_chart = false;
radius = false; radius = false;
fill_points = ''; fill_points = fill_color;
break; break;
case 'points': case 'points':
line_show = false; line_show = false;
@ -1232,7 +1240,7 @@ function pandoraFlotArea(
filled = true; filled = true;
steps_chart = true; steps_chart = true;
radius = false; radius = false;
fill_points = ''; fill_points = fill_color;
break; break;
} }
data_base.push({ data_base.push({