diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 54cab54c1e..fae2a31e21 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -903,6 +903,20 @@ $config['os'][$os]['over'][2]['text'] = 'Memory Usage';
 $config['os'][$os]['over'][3]['graph'] = 'device_storage';
 $config['os'][$os]['over'][3]['text'] = 'Storage Usage';
 
+// EMC Isilon OneFS
+$os = 'onefs';
+$config['os'][$os]['text'] = 'EMC Isilon OneFS';
+$config['os'][$os]['type'] = 'storage';
+$config['os'][$os]['icon'] = 'emc';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text'] = 'Device Traffic';
+$config['os'][$os]['over'][1]['graph'] = 'device_processor';
+$config['os'][$os]['over'][1]['text'] = 'CPU Usage';
+$config['os'][$os]['over'][2]['graph'] = 'device_mempool';
+$config['os'][$os]['over'][2]['text'] = 'Memory Usage';
+$config['os'][$os]['over'][3]['graph'] = 'device_storage';
+$config['os'][$os]['over'][3]['text'] = 'Storage Usage';
+
 $os = 'equallogic';
 $config['os'][$os]['text']             = 'Dell EqualLogic';
 $config['os'][$os]['icon']             = 'dell';
diff --git a/includes/discovery/os/onefs.inc.php b/includes/discovery/os/onefs.inc.php
new file mode 100644
index 0000000000..77fd6374ab
--- /dev/null
+++ b/includes/discovery/os/onefs.inc.php
@@ -0,0 +1,7 @@
+<?php
+
+if (!$os) {
+    if (strstr($sysObjectId, '.1.3.6.1.4.1.12124.1')) {
+        $os = 'onefs';
+    }
+}
diff --git a/includes/polling/os/onefs.inc.php b/includes/polling/os/onefs.inc.php
new file mode 100644
index 0000000000..6d9c5c9ee5
--- /dev/null
+++ b/includes/polling/os/onefs.inc.php
@@ -0,0 +1,7 @@
+<?php
+
+//sysDescr Isilon OneFS HPCDATA-1 v7.0.2.8 Isilon OneFS v7.0.2.8 B_7_0_2_8_269(RELEASE) amd64
+
+preg_match('/Isilon OneFS HPCDATA-1 (.*) Isilon OneFS (.*) (.*)\(RELEASE\) (.*)/', $poll_device['sysDescr'], $matches);
+$version  = $matches[2];
+$hardware = $matches[3];