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

Fixed styles and reorganizate elements of graphs. Gitlab: #537

This commit is contained in:
m-lopez-f 2017-03-16 16:38:24 +01:00
parent c8a0946eda
commit 139c4d0d40
3 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/include/functions.php
View File

@ -1531,7 +1531,7 @@ function get_snmpwalk($ip_target, $snmp_version, $snmp_community = '',
$snmpwalk_bin = '/usr/pkg/bin/snmpwalk';
break;
default:
$snmpwalk_bin = 'snmpwalk';
$snmpwalk_bin = 'snmpbulkwalk';
break;
}
}
@ -1598,6 +1598,7 @@ function get_snmpwalk($ip_target, $snmp_version, $snmp_community = '',
break;
}
html_debug($command_str, true);
exec($command_str, $output, $rc);
// Parse the output of snmpwalk

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

@ -1540,33 +1540,30 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
tickColor: background_color,
markings: markings,
color: legend_color
},
xaxes: [ {
axisLabelFontSizePixels: font_size,
axisLabelUseCanvas: false,
axisLabel: xaxisname,
tickFormatter: xFormatter,
//~ minTickSize: steps,
color: '',
font: font
} ],
yaxes: [ {
tickFormatter: yFormatter,
color: ''
},
{
// align if we are to the right
alignTicksWithAxis: 1,
position: 'right',
font: font
//tickFormatter: dFormatter
} ]
,
},
xaxes: [{
axisLabelFontSizePixels: font_size,
axisLabelUseCanvas: false,
axisLabel: xaxisname,
tickFormatter: xFormatter,
labelHeight: 50,
color: '',
font: font
}],
yaxes: [{
tickFormatter: yFormatter,
color: '',
alignTicksWithAxis: 1,
position: 'left',
font: font,
labelWidth: 50,
reserveSpace: true,
}],
legend: {
position: 'se',
container: $('#legend_' + graph_id),
labelFormatter: lFormatter
}
}
};
if (vconsole) {
options.grid['hoverable'] = false;
@ -1874,18 +1871,18 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
if (labels[v] == undefined) {
return '';
}
return '<div class='+font+' style=font-size:'+font_size+'pt>'+labels[v]+'</div>';
return '<div class='+font+' style="font-size:'+font_size+'pt; margin-top:15px; transform:rotate(-28deg)">'+labels[v]+'</div>';
}
function yFormatter(v, axis) {
axis.datamin = 0;
var formatted = number_format(v,force_integer,unit);
return '<div class='+font+' style=font-size:'+font_size+'pt>'+formatted+'</div>';
return '<div class='+font+' style="font-size:'+font_size+'pt;">'+formatted+'</div>';
}
function lFormatter(v, item) {
return '<div style=font-size:'+font_size+'pt>'+v+'</div>';
return '<div style="font-size:'+font_size+'pt;">'+v+'</div>';
// Prepared to turn series with a checkbox
//return '<div style=color:;font-size:'+font_size+'pt><input type="checkbox" id="' + graph_id + '_' + item.id +'" checked="checked" class="check_serie_'+graph_id+'">'+v+'</div>';
}
@ -1994,7 +1991,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
$('#legend_'+graph_id).css('margin-bottom', '10px');
parent_height = parseInt(
$('#menu_'+graph_id).parent().css('height').split('px')[0]);
adjust_menu(graph_id, plot, parent_height);
adjust_menu(graph_id, plot, parent_height, width);
}
if (!dashboard) {
@ -2028,16 +2025,16 @@ function adjust_menu(graph_id, plot, parent_height, width) {
menu_height = $('#menu_'+graph_id).height();
}
offset_between_graph_and_div_graph_container = $('#' + graph_id).offset().top -
$('#' + graph_id).parent().offset().top;
offset = $('#' + graph_id).offsetTop;
$('#menu_' + graph_id)
.css('top',
((offset_between_graph_and_div_graph_container - menu_height - 5) + 'px'));
((offset + 10) + 'px'));
//$('#legend_' + graph_id).css('width',plot.width());
$('#menu_' + graph_id)
.css('left',width - $('#menu_'+graph_id).width());
$('#menu_' + graph_id).css('left', $('#'+graph_id)[0].offsetWidth);
$('#menu_' + graph_id).show();
}

7
pandora_console/include/graphs/functions_flot.php
View File

@ -203,7 +203,7 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
}
// Parent layer
$return = "<div class='parent_graph' style='width: " . $width . "px; " . $background_style . "'>";
$return = "<div class='parent_graph' style='width: " . ($width + 100) . "px; height: ".($height + 200 )."px; " . $background_style . "'>";
// Set some containers to legend, graph, timestamp tooltip, etc.
$return .= "<p id='legend_$graph_id' class='legend_graph' style='font-size:".$font_size."pt'></p>";
@ -245,9 +245,10 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
$return .= "<div id='menu_$graph_id' class='menu_graph' " .
"style='display: none; " .
"text-align: center; " .
"width: " . $menu_width . "px; ".
"width: 25px; ".
"border-bottom: 0px; " .
"padding: 4px 4px 4px 4px;margin-bottom:5px;'>
"padding: 4px 4px 4px 4px;
margin-bottom:5px;'>
<a href='javascript:'><img id='menu_cancelzoom_$graph_id' src='".$homeurl."images/zoom_cross_grey.disabled.png' alt='".__('Cancel zoom')."' title='".__('Cancel zoom')."'></a>";
if ($threshold) {
$return .= " <a href='javascript:'><img id='menu_threshold_$graph_id' src='".$homeurl."images/chart_curve_threshold.png' alt='".__('Warning and Critical thresholds')."' title='".__('Warning and Critical thresholds')."'></a>";