Major changes to graphing system organisation. Prevent sensors from being discovered in ENTITY-SENSOR-MIB if they've already been detected in CISCO-ENTITY-SENSOR-MIB (they share entPhysicalIndex). Fix ADSL poller. Make popup overlibs prettier as default.

git-svn-id: http://www.observium.org/svn/observer/trunk@1470 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-07-24 19:14:41 +00:00
parent 289228a544
commit ada14bd542
125 changed files with 432 additions and 403 deletions
@@ -0,0 +1,53 @@
<?php
include("common.inc.php");
$device = device_by_id_cache($id);
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv6.rrd";
$rrd_options .= " DEF:InForwDatagrams=$rrd_filename:InForwDatagrams:AVERAGE";
$rrd_options .= " DEF:InDelivers=$rrd_filename:InDelivers:AVERAGE";
$rrd_options .= " DEF:InReceives=$rrd_filename:InReceives:AVERAGE";
$rrd_options .= " DEF:InDiscards=$rrd_filename:InDiscards:AVERAGE";
$rrd_options .= " DEF:OutForwDatagrams=$rrd_filename:OutForwDatagrams:AVERAGE";
$rrd_options .= " CDEF:OutForwDatagrams_n=OutForwDatagrams,-1,*";
$rrd_options .= " DEF:OutRequests=$rrd_filename:OutRequests:AVERAGE";
$rrd_options .= " CDEF:OutRequests_n=OutRequests,-1,*";
$rrd_options .= " DEF:OutDiscards=$rrd_filename:OutDiscards:AVERAGE";
$rrd_options .= " CDEF:OutDiscards_n=OutDiscards,-1,*";
$rrd_options .= " DEF:OutNoRoutes=$rrd_filename:InDiscards:AVERAGE";
$rrd_options .= " CDEF:OutNoRoutes_n=OutNoRoutes,-1,*";
$rrd_options .= " COMMENT:'Packets/sec Current Average Maximum\\n'";
$rrd_options .= " LINE1.25:InReceives#7D9B5B:'InReceives v6'";
$rrd_options .= " GPRINT:InReceives:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:InReceives:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:InReceives:MAX:%6.2lf%s\\\\n";
$rrd_options .= " AREA:InForwDatagrams#AF63AF:'InForward v6'";
$rrd_options .= " GPRINT:InForwDatagrams:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:InForwDatagrams:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:InForwDatagrams:MAX:%6.2lf%s\\\\n";
$rrd_options .= " AREA:InDelivers#CDEB8B:'InDelivers v6':STACK";
$rrd_options .= " GPRINT:InDelivers:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:InDelivers:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:InDelivers:MAX:%6.2lf%s\\\\n";
$rrd_options .= " AREA:OutRequests_n#C3D9FF:'OutRequests v6'";
$rrd_options .= " GPRINT:OutRequests:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:OutRequests:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:OutRequests:MAX:%6.2lf%s\\\\n";
$rrd_options .= " AREA:OutForwDatagrams#AF63AF:'OutForward v6'";
$rrd_options .= " GPRINT:OutForwDatagrams:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:OutForwDatagrams:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:OutForwDatagrams:MAX:%6.2lf%s\\\\n";
$rrd_options .= " LINE1.25:InReceives#9DaB6B:";
$rrd_options .= " LINE1.25:OutRequests_n#93a6eF:";
?>