From e62f4dcd6cb536684e1e93af75a15f9b26ada26c Mon Sep 17 00:00:00 2001
From: Ahmed Sajid <ahmed4343@hotmail.com>
Date: Thu, 4 Aug 2016 09:15:00 -0400
Subject: [PATCH] Equalogic patches

Detect Equalogics as storage device.

The units need to be set to 1000000 since the returned storage values are in MBs.
---
 includes/definitions.inc.php                   | 1 +
 includes/discovery/storage/eql-storage.inc.php | 2 +-
 includes/polling/storage/eql-storage.inc.php   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index a24a2d10a6..f3bd8777bb 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1048,6 +1048,7 @@ $config['os'][$os]['over'][3]['text'] = 'Storage Usage';
 
 $os = 'equallogic';
 $config['os'][$os]['text']             = 'Dell EqualLogic';
+$config['os'][$os]['type'] 	       = 'storage';
 $config['os'][$os]['icon']             = 'dell';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Device Traffic';
diff --git a/includes/discovery/storage/eql-storage.inc.php b/includes/discovery/storage/eql-storage.inc.php
index 2951fcd5af..d287613238 100644
--- a/includes/discovery/storage/eql-storage.inc.php
+++ b/includes/discovery/storage/eql-storage.inc.php
@@ -19,7 +19,7 @@ if (is_array($eql_storage)) {
     foreach ($eql_storage as $index => $storage) {
         $fstype = $storage['eqliscsiVolumeAdminStatus'];
         $descr  = $storage['eqliscsiVolumeName'];
-        $units  = 1;
+        $units  = 1000000;
         $size = $storage['eqliscsiVolumeSize'] * $units;
         $used = $storage['eqliscsiVolumeStatusAllocatedSpace'] * $units;
         if (is_int($index)) {
diff --git a/includes/polling/storage/eql-storage.inc.php b/includes/polling/storage/eql-storage.inc.php
index 77d05e8b55..d99dabfe5d 100644
--- a/includes/polling/storage/eql-storage.inc.php
+++ b/includes/polling/storage/eql-storage.inc.php
@@ -53,7 +53,7 @@ d_echo($storage_cache20);
 $entry1 = $storage_cache10[$storage[storage_index]];
 $entry2 = $storage_cache20[$storage[storage_index]];
 
-$storage['units'] = 1;
+$storage['units'] = 1000000;
 $storage['size'] = ($entry1['eqliscsiVolumeSize'] * $storage['units']);
 $storage['used'] = ($entry2['eqliscsiVolumeStatusAllocatedSpace'] * $storage['units']);
 $storage['free'] = ($storage['size'] - $storage['used']);