From a2636b4668544bc46c66bc342df8e5f159f4ee5a Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Mon, 9 Aug 2010 22:59:54 +0000
Subject: [PATCH] fix uptime graph

git-svn-id: http://www.observium.org/svn/observer/trunk@1652 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/graphs/device/uptime.inc.php | 4 ----
 html/index.php                             | 3 ++-
 poller.php                                 | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/html/includes/graphs/device/uptime.inc.php b/html/includes/graphs/device/uptime.inc.php
index 69775f1fce..d80b1350f3 100644
--- a/html/includes/graphs/device/uptime.inc.php
+++ b/html/includes/graphs/device/uptime.inc.php
@@ -5,11 +5,7 @@ $scale_min = "0";
 include("includes/graphs/common.inc.php");
 $device = device_by_id_cache($id);
 
-if (is_file($config['rrd_dir'] . "/" . $device['hostname'] . "/hrSystem.rrd")) {
-  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/hrSystem.rrd";
-} else {
   $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/uptime.rrd";
-}
 
   $rrd_options .= " DEF:uptime=$rrd_filename:uptime:AVERAGE";
   $rrd_options .= " CDEF:cuptime=uptime,86400,/";
diff --git a/html/index.php b/html/index.php
index ec635ed547..33caf1be67 100755
--- a/html/index.php
+++ b/html/index.php
@@ -107,7 +107,8 @@ function popUp(URL) {
     $end = utime(); $run = $end - $start;
     $gentime = substr($run, 0, 5);
 
-    echo '<br />  <div id="footer">' . (isset($config['footer']) ? $config['footer'] : '');
+  
+    echo '<br /> <br /> <br /> <br />  <div id="footer">' . (isset($config['footer']) ? $config['footer'] : '');
     echo '<br />Powered by <a href="http://www.observium.org" target="_blank">Observium ' . $config['version'];
 
     if (file_exists('.svn/entries'))
diff --git a/poller.php b/poller.php
index 87b4dcc087..f7a3798e13 100755
--- a/poller.php
+++ b/poller.php
@@ -105,7 +105,7 @@ while ($device = mysql_fetch_assoc($device_query))
     $sysDescr = trim(shell_exec($config['snmpget'] . " -m SNMPv2-MIB -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " .  $device['hostname'].":".$device['port'] . " sysDescr.0"));
     $sysName = strtolower($sysName);
 
-    $hrSystemUptime = snmp_get($device, ".1.3.6.1.2.1.25.1.1.0", "-Oqv", "HOST-RESOURCES-MIB");
+    $hrSystemUptime = snmp_get($device, "HOST-RESOURCES-MIB::hrSystemUptime.0", "-Oqv");
 
 #    echo("UPTIMES: ".$hrSystemUptime."|".$sysUptime."]");