From a34b95835279cd3effa22f49d142c3e0c03a0b78 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Fri, 5 Feb 2016 17:57:17 -0600
Subject: [PATCH 1/5] Add hardware and version for Netonix.

---
 includes/polling/os/netonix.inc.php | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 includes/polling/os/netonix.inc.php

diff --git a/includes/polling/os/netonix.inc.php b/includes/polling/os/netonix.inc.php
new file mode 100644
index 0000000000..bd63ed309e
--- /dev/null
+++ b/includes/polling/os/netonix.inc.php
@@ -0,0 +1,3 @@
+<?php
+$version = snmp_get($device, 'firmwareVersion.0', '-OQv', 'NETONIX-SWITCH-MIB', '/opt/librenms/mibs:/opt/librenms/mibs/netonix');
+$hardware = $poll_device['sysDescr'];

From 21c2bb312a589c1b255850298d6e6eb2f61c6ca7 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Mon, 8 Feb 2016 15:50:54 -0600
Subject: [PATCH 2/5] Do not hardcode mib path

---
 includes/polling/os/netonix.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/polling/os/netonix.inc.php b/includes/polling/os/netonix.inc.php
index bd63ed309e..50c1782a8b 100644
--- a/includes/polling/os/netonix.inc.php
+++ b/includes/polling/os/netonix.inc.php
@@ -1,3 +1,3 @@
 <?php
-$version = snmp_get($device, 'firmwareVersion.0', '-OQv', 'NETONIX-SWITCH-MIB', '/opt/librenms/mibs:/opt/librenms/mibs/netonix');
+$version = snmp_get($device, 'firmwareVersion.0', '-OQv', 'NETONIX-SWITCH-MIB', $config['mib_dir'].':'.$config['mib_dir'].'/netonix');
 $hardware = $poll_device['sysDescr'];

From 1b59ae964868397089577c613c49af4ee714df02 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Tue, 9 Feb 2016 08:01:41 -0600
Subject: [PATCH 3/5] Use $config['mibdir'] instead of $config['mib_dir']

---
 includes/polling/os/netonix.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/polling/os/netonix.inc.php b/includes/polling/os/netonix.inc.php
index 50c1782a8b..3b58eb81c8 100644
--- a/includes/polling/os/netonix.inc.php
+++ b/includes/polling/os/netonix.inc.php
@@ -1,3 +1,3 @@
 <?php
-$version = snmp_get($device, 'firmwareVersion.0', '-OQv', 'NETONIX-SWITCH-MIB', $config['mib_dir'].':'.$config['mib_dir'].'/netonix');
+$version = snmp_get($device, 'firmwareVersion.0', '-OQv', 'NETONIX-SWITCH-MIB', $config['mibdir'].':'.$config['mibdir'].'/netonix');
 $hardware = $poll_device['sysDescr'];

From 0422d8e58901b08669743cec33851f8c8d52eec3 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Tue, 9 Feb 2016 13:31:36 -0600
Subject: [PATCH 4/5] Add fanspeed,temp, and voltage for Netonix switches.

---
 .../sensors/fanspeeds/netonix.inc.php          | 17 +++++++++++++++++
 .../sensors/temperatures/netonix.inc.php       | 17 +++++++++++++++++
 .../discovery/sensors/voltages/netonix.inc.php | 18 ++++++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 includes/discovery/sensors/fanspeeds/netonix.inc.php
 create mode 100644 includes/discovery/sensors/temperatures/netonix.inc.php
 create mode 100644 includes/discovery/sensors/voltages/netonix.inc.php

diff --git a/includes/discovery/sensors/fanspeeds/netonix.inc.php b/includes/discovery/sensors/fanspeeds/netonix.inc.php
new file mode 100644
index 0000000000..0a4a942d86
--- /dev/null
+++ b/includes/discovery/sensors/fanspeeds/netonix.inc.php
@@ -0,0 +1,17 @@
+<?php
+
+// Netonix Fan Speeds
+if ($device['os'] == 'netonix') {
+    echo 'Netonix: ';
+    $oids = snmpwalk_cache_multi_oid($device, 'fanTable', array(), 'NETONIX-SWITCH-MIB', '+'.$config['mibdir'].'/netonix');
+    if (is_array($oids)) {
+        foreach ($oids as $index => $entry) {
+            if (is_numeric($entry['fanSpeed']) && is_numeric($index)) {
+                $descr   = $index;
+                $oid     = '.1.3.6.1.4.1.46242.2.1.2.'.$index;
+                $current = $entry['fanSpeed'];
+                discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, $index, $device['os'], $descr, '1', '1', null, null, null, null, $current);
+            }
+        }
+    }
+}//end if
diff --git a/includes/discovery/sensors/temperatures/netonix.inc.php b/includes/discovery/sensors/temperatures/netonix.inc.php
new file mode 100644
index 0000000000..fbaf910eca
--- /dev/null
+++ b/includes/discovery/sensors/temperatures/netonix.inc.php
@@ -0,0 +1,17 @@
+<?php
+
+// Netonix Temperatures
+if ($device['os'] == 'netonix') {
+    echo 'Netonix: ';
+    $oids = snmpwalk_cache_multi_oid($device, 'tempTable', array(), 'NETONIX-SWITCH-MIB', '+'.$config['mibdir'].'/netonix');
+    if (is_array($oids)) {
+        foreach ($oids as $index => $entry) {
+            if (is_numeric($entry['temp']) && is_numeric($index) && $entry['temp'] > '0') {
+                $descr   = $entry['tempDescription'];
+                $oid     = '.1.3.6.1.4.1.46242.3.1.3.'.$index;
+                $current = $entry['temp'];
+                discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, $device['os'], $descr, '1', '1', null, null, null, null, $current);
+            }
+        }
+    }
+}//end if
diff --git a/includes/discovery/sensors/voltages/netonix.inc.php b/includes/discovery/sensors/voltages/netonix.inc.php
new file mode 100644
index 0000000000..f800df6e9a
--- /dev/null
+++ b/includes/discovery/sensors/voltages/netonix.inc.php
@@ -0,0 +1,18 @@
+<?php
+
+// Netonix Voltages
+if ($device['os'] == 'netonix') {
+    echo 'Netonix: ';
+    $oids = snmpwalk_cache_multi_oid($device, 'voltageTable', array(), 'NETONIX-SWITCH-MIB', '+'.$config['mibdir'].'/netonix');
+    if (is_array($oids)) {
+        foreach ($oids as $index => $entry) {
+            if (is_numeric($entry['voltage']) && is_numeric($index) && $entry['voltage'] > '0') {
+                $descr   = $entry['voltageDescription'];
+                $oid     = '.1.3.6.1.4.1.46242.4.1.3.'.$index;
+                $current = $entry['voltage'];
+                $divisor = 100;
+                discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $device['os'], $descr, $divisor, '1', null, null, null, null, $current);
+            }
+        }
+    }
+}//end if

From f45bceecba55821e6f4dbaea0d593410ea9bfeb6 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Tue, 9 Feb 2016 13:36:44 -0600
Subject: [PATCH 5/5] The fanspeed is frequently 0 rpm.

---
 includes/discovery/sensors/fanspeeds/netonix.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/discovery/sensors/fanspeeds/netonix.inc.php b/includes/discovery/sensors/fanspeeds/netonix.inc.php
index 0a4a942d86..b2882d0b58 100644
--- a/includes/discovery/sensors/fanspeeds/netonix.inc.php
+++ b/includes/discovery/sensors/fanspeeds/netonix.inc.php
@@ -10,7 +10,7 @@ if ($device['os'] == 'netonix') {
                 $descr   = $index;
                 $oid     = '.1.3.6.1.4.1.46242.2.1.2.'.$index;
                 $current = $entry['fanSpeed'];
-                discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, $index, $device['os'], $descr, '1', '1', null, null, null, null, $current);
+                discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, $index, $device['os'], $descr, '1', '1', '0', '0', null, null, $current);
             }
         }
     }