diff --git a/includes/definitions/discovery/netonix.yaml b/includes/definitions/discovery/netonix.yaml
new file mode 100644
index 0000000000..1f9a8a71af
--- /dev/null
+++ b/includes/definitions/discovery/netonix.yaml
@@ -0,0 +1,18 @@
+mib: NETONIX-SWITCH-MIB
+modules:
+    sensors:
+        state:
+            data:
+                -
+                    oid: poeStatusTable
+                    value: poeStatus
+                    num_oid: .1.3.6.1.4.1.46242.5.1.2.
+                    descr: Port {{ $index }} PoE
+                    index: '{{ $index }}'
+                    state_name: netonixPoeStatus
+                    states:
+                        - { descr: Off, graph: 0, value: 1, generic: -1 }
+                        - { descr: 24V, graph: 0, value: 2, generic: 0 }
+                        - { descr: 48V, graph: 0, value: 3, generic: 0 }
+                        - { descr: 24VH, graph: 0, value: 4, generic: 0 }
+                        - { descr: 48VH, graph: 0, value: 5, generic: 0 }
diff --git a/includes/discovery/sensors/state/netonix.inc.php b/includes/discovery/sensors/state/netonix.inc.php
deleted file mode 100644
index 21f38d1cc9..0000000000
--- a/includes/discovery/sensors/state/netonix.inc.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * netonix.inc.php
- *
- * LibreNMS states module for Netonix
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @package    LibreNMS
- * @link       http://librenms.org
- * @copyright  2016 Tony Murray
- * @author     Tony Murray <murraytony@gmail.com>
- */
-
-// NETONIX-SWITCH-MIB::poeStatus
-$temp = snmpwalk_cache_multi_oid($device, '.1.3.6.1.4.1.46242.5.1.2', array());
-$cur_oid = '.1.3.6.1.4.1.';
-
-if (is_array($temp)) {
-    //Create State Index
-    $state_name = 'netonixPoeStatus';
-    $state_index_id = create_state_index($state_name);
-
-    $states_ids = array(
-        'Off' => 1,
-        '24V' => 2,
-        '48V' => 3
-    );
-
-    //Create State Translation
-    if ($state_index_id !== null) {
-        $states = array(
-            array($state_index_id,'Off',0,1,-1) ,
-            array($state_index_id,'24V',0,2,0) ,
-            array($state_index_id,'48V',0,3,1) ,
-        );
-        foreach ($states as $value) {
-            $insert = array(
-                'state_index_id' => $value[0],
-                'state_descr' => $value[1],
-                'state_draw_graph' => $value[2],
-                'state_value' => $value[3],
-                'state_generic_value' => $value[4]
-            );
-            dbInsert($insert, 'state_translations');
-        }
-    }
-
-    foreach ($temp as $index => $entry) {
-        $id = substr($index, strrpos($index, '.')+1);
-        $descr = 'Port ' . $id . ' PoE';
-        $current = $states_ids[$entry['enterprises']];
-        //Discover Sensors
-        discover_sensor($valid['sensor'], 'state', $device, $cur_oid.$index, $id, $state_name, $descr, '1', '1', null, null, null, null, $current);
-
-        //Create Sensor To State Index
-        create_sensor_to_state_index($device, $state_name, $id);
-    }
-}