From b230457eb768a29aa2281f665bdcfbdddac2a72a Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Fri, 12 Mar 2010 02:24:23 +0000
Subject: [PATCH] fix status setting for down also add new storage image :>

git-svn-id: http://www.observium.org/svn/observer/trunk@1010 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/images/icons/storage.png                | Bin 390 -> 644 bytes
 includes/discovery/storage-hrstorage.inc.php |   1 +
 poll-device.php                              |  20 +++++++++----------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/html/images/icons/storage.png b/html/images/icons/storage.png
index 3d09261a26eb97c6dedc1d3504cbc2cf915eb642..79bf874f14b6e02074ef76330d51f89ea5af09d0 100755
GIT binary patch
delta 630
zcmV-+0*U>G1B3;T8Gi-<001BJ|6u?C0!v9mK~#9!#nW3z6j2xl@c&$#*`1la%qH2Y
znNap%A*n40N#q*k_E3lwfv|`Pk<ddCQEX6jArQ-iF0u>JL!hAcR2pVwU|0`PON1IE
zL`Jr*tG4T2oSm6wW?^CJF`;=m%(?vF|9$5W_{Wb}Q=tC#K!1%y(wicy5|*SiBt-?O
z?Xb`^3ON>~HV%2J{4L;Zc>5RN?(AjvRc;GYW=@!nL@_VRuxf{_42=SsLNRB;7EwTW
zc{w%`oXYR<dQv%nr@P-%U$tXs;ztBii&1=uCn2R36j{x171&Vgbim~lQD`xv<LT=I
z0k3B`2WaT(yMI@-PCPjmjU${$A)-Z4WYt(>X%YoyJ%WHzhk(hS^Y{BsG`44fiu2v<
z;hp7kN4A&RV=FPpX&I`jW<ydG1(spK^Bn9p8y>#<y!7Pb^oB8CTgm{ceRt{}v>tp(
zr{ajm<B(+~3lId60Zc3eo`-0+<F{7a<Nn9)(F?7w41eHI*Q0Cx=Ka23p?M?|NhnG#
zKx<tv>3|@>A=<T(M|01>_1^ZQ7Y)GIKQi9pD&G}aScD`=#^EfW^^qbeFbo5;*<>L3
zq7^rX$KPCO+FNS?mj_>bZ>rc_JUTgpP%Hsbn=4x{qHb$R_KvJ1moYRGfSqxorsNm~
zKYg9O)NknCXaIYz`p>lOuIhB!ctW3`ND@4g2Tr>KdIVDY*Xyt<Cm?VZ1ZNl2yU!=i
zK0DWPE8E7h(;d~?=1PhnC_s;(=g+huQ^*XWWs+4z{Sdry>iyckh5rKl0qoJu5mx2<
Qr~m)}07*qoM6N<$f+wLY*#H0l

delta 374
zcmV-+0g3*E1%?BV8Gi%-006c6H|hWY00d`2O+f$vugEtAis=9V02y>eSaefwW^{L9
za%BKPWN%_+AW3auXJt}lVPtu6$z?nM009_DL_t&-83n=5ijH9z2jJ`dzDM6QldL8t
z3kl^<**FTDNzI0xbFfkl!4W76QQ{EPWTPxu%)-Kk8Vzd1lz(PC&wKw|*AxH%06+tF
zSJ}?Jx|%Dg+RNv9TDx~<n1bEwdAWJ>oDJ*Zw<BNue3!dB`-ph+_Dd>Bk|ase^C7RE
zMJymU&H?~9uWmzw65p*^IVJu&wC|Dv4N5e>9E;(P6HOFo5V5qTX}TdOGiXp^=!VH`
z=oX?tgA%i0SZ|tj-BQe;L5Z%LEzO25qJsvd3`2<$Gs-`(fZ3r<E5KySE#Gv|pzgna
zeQo1{l}T(lvghN$*oG<K#l?D5JBu^xhC{~(<N5sf;SZPsfG4NN<x&09gA)M$19bbI
Urt!i3M*si-07*qoM6N<$g3QLKasU7T

diff --git a/includes/discovery/storage-hrstorage.inc.php b/includes/discovery/storage-hrstorage.inc.php
index d0eeb625b..5efce507f 100755
--- a/includes/discovery/storage-hrstorage.inc.php
+++ b/includes/discovery/storage-hrstorage.inc.php
@@ -18,6 +18,7 @@ if(is_array($storage_array)) {
     if (isset($config['ignore_mount_removable']) && $config['ignore_mount_removable'] && $fstype == "hrStorageRemovableDisk") { $deny = 1; if ($debug) echo("skip(removable)\n"); }
     if (isset($config['ignore_mount_network']) && $config['ignore_mount_network'] && $fstype == "hrStorageNetworkDisk") { $deny = 1; if ($debug) echo("skip(network)\n"); }
     if (isset($config['ignore_mount_optical']) && $config['ignore_mount_optical'] && $fstype == "hrStorageCompactDisc") { $deny = 1; if ($debug) echo("skip(cd)\n"); }
+    if ($fstype == "hrStorageVirtualMemory" || $fstype == "hrStorageRam" || $fstype == "hrStorageOther") { $deny = 1; }
 
     if(!$deny && is_numeric($index)) {
       discover_storage($valid_storage, $device, $index, $fstype, "hrstorage", $descr, $size , $units, $used);
diff --git a/poll-device.php b/poll-device.php
index 86a35bbfe..db6a24fac 100755
--- a/poll-device.php
+++ b/poll-device.php
@@ -71,7 +71,16 @@ while ($device = mysql_fetch_array($device_query)) {
     $status = "0";
   }
 
-  if ($status) { 
+    if ( $device['status'] != $status )
+    {
+      $poll_update .= $poll_separator . "`status` = '$status'";
+      $poll_separator = ", ";
+      mysql_query("UPDATE `devices` SET `status` = '".$status."' WHERE `device_id` = '".$device['device_id']."'");
+      mysql_query("INSERT INTO alerts (importance, device_id, message) VALUES ('0', '" . $device['device_id'] . "', 'Device is " .($status == '1' ? 'up' : 'down') . "')");
+      eventlog('Device status changed to ' . ($status == '1' ? 'Up' : 'Down'), $device['device_id']);
+    }
+
+  if ($status == "1") { 
     $snmp_cmd =  $config['snmpget'] . " -m SNMPv2-MIB -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " .  $device['hostname'].":".$device['port'];
     $snmp_cmd .= " sysUpTime.0 sysLocation.0 sysContact.0 sysName.0 HOST-RESOURCES-MIB::hrSystemUptime.0";
     $snmpdata = shell_exec($snmp_cmd);
@@ -132,15 +141,6 @@ while ($device = mysql_fetch_array($device_query)) {
       $poll_separator = ", ";
     } 
 
-    if ( $device['status'] != $status ) 
-    {
-      $poll_update .= $poll_separator . "`status` = '$status'";
-      $poll_separator = ", ";
-      mysql_query("UPDATE `devices` SET `status` = '".$status."' WHERE `device_id` = '".$device['device_id']."'");
-      mysql_query("INSERT INTO alerts (importance, device_id, message) VALUES ('0', '" . $device['device_id'] . "', 'Device is " . ($status == '1' ? 'up' : 'down') . "')");
-      eventlog('Device status changed to ' . ($status == '1' ? 'Up' : 'Down'), $device['device_id']);
-    }
-
     if (is_file($config['install_dir'] . "/includes/polling/device-".$device['os'].".inc.php")) {
       /// OS Specific
       include($config['install_dir'] . "/includes/polling/device-".$device['os'].".inc.php");