new graph structure. cleaned up extremeware. print device ver/features/hw during poll. add extreme device rewriting

git-svn-id: http://www.observium.org/svn/observer/trunk@1399 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-07-18 03:56:19 +00:00
parent fc5acf0010
commit c2b6f80aec
34 changed files with 289 additions and 209 deletions

View File

@@ -0,0 +1,25 @@
<?php
include("common.inc.php");
$device = device_by_id_cache($id);
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-snmp.rrd";
$rrd_options .= " DEF:snmpInPkts=$rrd_filename:snmpInPkts:AVERAGE";
$rrd_options .= " DEF:snmpInPkts_max=$rrd_filename:snmpInPkts:MAX";
$rrd_options .= " DEF:snmpOutPkts=$rrd_filename:snmpOutPkts:AVERAGE";
$rrd_options .= " DEF:snmpOutPkts_max=$rrd_filename:snmpOutPkts:MAX";
$rrd_options .= " CDEF:snmpOutPkts_max_neg=snmpOutPkts_max,-1,*";
$rrd_options .= " CDEF:snmpOutPkts_neg=snmpOutPkts,-1,*";
$rrd_options .= " COMMENT:Packets/sec\ \ \ \ Current\ \ \ \ Average\ \ \ Maximum\\\\n";
$rrd_options .= " LINE1.25:snmpInPkts#009900:snmpInPkts\ \ ";
$rrd_options .= " GPRINT:snmpInPkts:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:snmpInPkts:AVERAGE:\ %6.2lf%s";
$rrd_options .= " GPRINT:snmpInPkts_max:MAX:\ %6.2lf%s\\\\n";
$rrd_options .= " LINE1.25:snmpOutPkts_neg#003399:snmpOutPkts\ ";
#$rrd_options .= " AREA:snmpOutPkts_max_neg#4466AA::";
$rrd_options .= " GPRINT:snmpOutPkts:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:snmpOutPkts:AVERAGE:\ %6.2lf%s";
$rrd_options .= " GPRINT:snmpOutPkts_max:MAX:\ %6.2lf%s\\\\n";
?>

View File

@@ -0,0 +1,49 @@
<?php
include("common.inc.php");
$device = device_by_id_cache($id);
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-snmp.rrd";
$rrd_options .= " DEF:snmpInTraps=$rrd_filename:snmpInTraps:AVERAGE";
$rrd_options .= " DEF:snmpOutTraps=$rrd_filename:snmpOutTraps:AVERAGE";
$rrd_options .= " DEF:snmpInTotalReqVars=$rrd_filename:snmpInTotalReqVars:AVERAGE";
$rrd_options .= " DEF:snmpInTotalSetVars=$rrd_filename:snmpInTotalSetVars:AVERAGE";
$rrd_options .= " DEF:snmpOutGetResponses=$rrd_filename:snmpOutGetResponses:AVERAGE";
$rrd_options .= " DEF:snmpOutSetRequests=$rrd_filename:snmpOutSetRequests:AVERAGE";
$rrd_options .= " DEF:snmpInTraps_max=$rrd_filename:snmpInTraps:MAX";
$rrd_options .= " DEF:snmpOutTraps_max=$rrd_filename:snmpOutTraps:MAX";
$rrd_options .= " DEF:snmpInTotalReqVars_max=$rrd_filename:snmpInTotalReqVars:MAX";
$rrd_options .= " DEF:snmpInTotalSetVars_max=$rrd_filename:snmpInTotalSetVars:MAX";
$rrd_options .= " DEF:snmpOutGetResponses_max=$rrd_filename:snmpOutGetResponses:MAX";
$rrd_options .= " DEF:snmpOutSetRequests_max=$rrd_filename:snmpOutSetRequests:MAX";
$rrd_options .= " COMMENT:Packets/sec\ \ \ \ \ \ \ \ Current\ \ Average\ \ Maximum\\\\n";
$rrd_options .= " LINE1.25:snmpInTraps#00cc00:InTraps ";
$rrd_options .= " GPRINT:snmpInTraps:LAST:\ \ \ \ \ \ \ \ %6.2lf%s";
$rrd_options .= " GPRINT:snmpInTraps:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:snmpInTraps_max:MAX:%6.2lf%s\\\\n";
$rrd_options .= " LINE1.25:snmpOutTraps#006600:OutTraps ";
$rrd_options .= " GPRINT:snmpOutTraps:LAST:\ \ \ \ \ \ \ %6.2lf%s";
$rrd_options .= " GPRINT:snmpOutTraps:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:snmpOutTraps_max:MAX:%6.2lf%s\\\\n";
$rrd_options .= " LINE1.25:snmpInTotalReqVars#cc0000:InTotalReqVars ";
$rrd_options .= " GPRINT:snmpInTotalReqVars:LAST:\ %6.2lf%s";
$rrd_options .= " GPRINT:snmpInTotalReqVars:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:snmpInTotalReqVars_max:MAX:%6.2lf%s\\\\n";
$rrd_options .= " LINE1.25:snmpInTotalSetVars#660000:InTotalSetVars ";
$rrd_options .= " GPRINT:snmpInTotalSetVars:LAST:\ %6.2lf%s";
$rrd_options .= " GPRINT:snmpInTotalSetVars:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:snmpInTotalSetVars_max:MAX:%6.2lf%s\\\\n";
$rrd_options .= " LINE1.25:snmpOutGetResponses#0066cc:OutGetResponses ";
$rrd_options .= " GPRINT:snmpOutGetResponses:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:snmpOutGetResponses:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:snmpOutGetResponses_max:MAX:%6.2lf%s\\\\n";
$rrd_options .= " LINE1.25:snmpOutSetRequests#003399:OutSetResponses ";
$rrd_options .= " GPRINT:snmpOutSetRequests:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:snmpOutSetRequests:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:snmpOutSetRequests_max:MAX:%6.2lf%s\\\\n";
?>

View File

@@ -7,24 +7,24 @@
echo('<div style="padding:4px 0px 0px 8px;" class=graphhead>'.$graph_title.'</div>');
$daily_traffic = "graph.php?device=" . $device['device_id'] . "&type=$graph_type&from=$day&to=$now&width=215&height=100";
$daily_traffic = "graph.php?device=" . $device['device_id'] . "&type=$graph_type&from=".$config['day']."&to=".$config['now']."&width=215&height=100";
$daily_traffic .= $args;
$daily_url = "graph.php?device=" . $device['device_id'] . "&type=$graph_type&from=$day&to=$now&width=400&height=150";
$daily_url = "graph.php?device=" . $device['device_id'] . "&type=$graph_type&from=".$config['day']."&to=".$config['now']."&width=400&height=150";
$daily_url .= $args;
$weekly_traffic = "graph.php?device=" . $device['device_id'] . "&type=$graph_type&from=$week&to=$now&width=215&height=100";
$weekly_traffic = "graph.php?device=" . $device['device_id'] . "&type=$graph_type&from=".$config['week']."&to=".$config['now']."&width=215&height=100";
$weekly_traffic .= $args;
$weekly_url = "graph.php?device=" . $device['device_id'] . "&type=$graph_type&from=$week&to=$now&width=400&height=150";
$weekly_url = "graph.php?device=" . $device['device_id'] . "&type=$graph_type&from=".$config['week']."&to=".$config['now']."&width=400&height=150";
$weekly_url .= $args;
$monthly_traffic = "graph.php?device=" . $device['device_id'] . "&type=$graph_type&from=$month&to=$now&width=215&height=100";
$monthly_traffic = "graph.php?device=" . $device['device_id'] . "&type=$graph_type&from=".$config['month']."&to=".$config['now']."&width=215&height=100";
$monthly_traffic .= $args;
$monthly_url = "graph.php?device=" . $device['device_id'] . "&type=$graph_type&from=$month&to=$now&width=400&height=150";
$monthly_url = "graph.php?device=" . $device['device_id'] . "&type=$graph_type&from=".$config['month']."&to=".$config['now']."&width=400&height=150";
$monthly_url .= $args;
$yearly_traffic = "graph.php?device=" . $device['device_id'] . "&type=$graph_type&from=$year&to=$now&width=215&height=100";
$yearly_traffic = "graph.php?device=" . $device['device_id'] . "&type=$graph_type&from=".$config['year']."&to=".$config['now']."&width=215&height=100";
$yearly_traffic .= $args;
$yearly_url = "graph.php?device=" . $device['device_id'] . "&type=$graph_type&from=$year&to=$now&width=400&height=150";
$yearly_url = "graph.php?device=" . $device['device_id'] . "&type=$graph_type&from=".$config['year']."&to=".$config['now']."&width=400&height=150";
$yearly_url .= $args;
echo("<a onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\">