From 95e1713787d77bec073713bf2511b65c96c6f455 Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Sun, 18 Jul 2010 09:28:25 +0000 Subject: [PATCH] make ADSL more efficient (that mib is large and full of poo) git-svn-id: http://www.observium.org/svn/observer/trunk@1407 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/pages/device/health/processors.inc.php | 4 +--- includes/polling/ports.inc.php | 22 ++++++++++++++++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/html/pages/device/health/processors.inc.php b/html/pages/device/health/processors.inc.php index af8bdb5ee..70eba76b6 100644 --- a/html/pages/device/health/processors.inc.php +++ b/html/pages/device/health/processors.inc.php @@ -6,7 +6,7 @@ $procs = mysql_query("SELECT * FROM `processors` WHERE device_id = '" . $device['device_id'] . "'"); while($proc = mysql_fetch_array($procs)) { - $proc_url = "?page=device/".$device['device_id']."/health/processors/"; + $proc_url = $config['base_url']."/device/".$device['device_id']."/health/processors/"; $mini_url = $config['base_url'] . "/graph.php?id=".$proc['processor_id']."&type=processor&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4"; @@ -34,8 +34,6 @@ "); - - echo(""); $daily_graph = "graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$day&to=$now&width=211&height=100"; diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php index 24add5358..47a8f7cc3 100755 --- a/includes/polling/ports.inc.php +++ b/includes/polling/ports.inc.php @@ -31,7 +31,27 @@ foreach ($ifmib_oids as $oid) { echo("$oid "); $array = snmp_cache_oid($oid, $device, $array, "IF-MIB");} if($config['enable_ports_etherlike']) { echo("dot3Stats "); $array = snmp_cache_oid("dot3StatsEntry", $device, $array, "EtherLike-MIB"); } - if($config['enable_ports_adsl']) { echo("adsl "); $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1", $device, $array, "ADSL-LINE-MIB"); } + if($config['enable_ports_adsl']) { + echo("adsl "); $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1.2.1", $device, $array, "ADSL-LINE-MIB"); + $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1.3.1", $device, $array, "ADSL-LINE-MIB"); + $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1.4.1", $device, $array, "ADSL-LINE-MIB"); + $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1.5.1", $device, $array, "ADSL-LINE-MIB"); + $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1.6.1.1", $device, $array, "ADSL-LINE-MIB"); + $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1.6.1.2", $device, $array, "ADSL-LINE-MIB"); + $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1.6.1.3", $device, $array, "ADSL-LINE-MIB"); + $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1.6.1.4", $device, $array, "ADSL-LINE-MIB"); + $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1.6.1.5", $device, $array, "ADSL-LINE-MIB"); + $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1.6.1.6", $device, $array, "ADSL-LINE-MIB"); + $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1.6.1.7", $device, $array, "ADSL-LINE-MIB"); + $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1.6.1.8", $device, $array, "ADSL-LINE-MIB"); + $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1.7.1.1", $device, $array, "ADSL-LINE-MIB"); + $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1.7.1.2", $device, $array, "ADSL-LINE-MIB"); + $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1.7.1.3", $device, $array, "ADSL-LINE-MIB"); + $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1.7.1.4", $device, $array, "ADSL-LINE-MIB"); + $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1.7.1.5", $device, $array, "ADSL-LINE-MIB"); + $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1.7.1.6", $device, $array, "ADSL-LINE-MIB"); + $array = snmp_cache_oid(".1.3.6.1.2.1.10.94.1.1.7.1.7", $device, $array, "ADSL-LINE-MIB"); + } echo("\n");