diff --git a/includes/discovery/sensors/states/edgeswitch.inc.php b/includes/discovery/sensors/states/edgeswitch.inc.php
new file mode 100644
index 0000000000..bf240e7113
--- /dev/null
+++ b/includes/discovery/sensors/states/edgeswitch.inc.php
@@ -0,0 +1,44 @@
+<?php
+/*
+ * LibreNMS Ubiquiti EdgeSwitch States information module
+ *
+ * Copyright (c) 2016 Cercel Valentin <crc@nuamchefazi.ro>
+ * 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.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+
+if ($device['os'] == 'edgeswitch') {
+    d_echo('UBNT EdgeSwitch Chassis state');
+    //EdgeSwitch-BOXSERVICES-PRIVATE-MIB::boxServicesTempUnitState
+    $chassis_state_oid = '.1.3.6.1.4.1.4413.1.1.43.1.15.1.2.1';
+    $state_name = 'edgeswitch_state';
+    $descr = 'Chassis state';
+    $state = snmp_get($device, $chassis_state_oid, '-Oqv');
+    if (!empty($state)) {
+        $state_index_id = create_state_index($state_name);
+        if ($state_index_id !== null) {
+            $states = array(
+                array($state_index_id, 'other', 0, 0, 3),
+                array($state_index_id, 'ok', 1, 1, 0),
+                array($state_index_id, 'degraded', 1, 2, 1),
+                array($state_index_id, 'failed', 1, 3, 2),
+            );
+
+            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');
+            }
+        }
+        discover_sensor($valid['sensor'], 'state', $device, $chassis_state_oid, 1, $state_name, $descr, '1', '1', null, null, null, null, $state, 'snmp', 1);
+        create_sensor_to_state_index($device, $state_name, 1);
+    }
+}
diff --git a/includes/discovery/sensors/temperatures/edgeswitch.inc.php b/includes/discovery/sensors/temperatures/edgeswitch.inc.php
new file mode 100644
index 0000000000..ab2da16236
--- /dev/null
+++ b/includes/discovery/sensors/temperatures/edgeswitch.inc.php
@@ -0,0 +1,30 @@
+<?php
+/*
+ * LibreNMS Ubiquiti EdgeSwitch Temperature information module
+ *
+ * Copyright (c) 2016 Cercel Valentin <crc@nuamchefazi.ro>
+ * 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.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+
+if ($device['os'] == 'edgeswitch') {
+    d_echo('UBNT EdgeSwitch Temperatures');
+    $sensor_type = 'edgeswitch_temp';
+    //EdgeSwitch-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorIndex
+    $sensors_id_oid = '.1.3.6.1.4.1.4413.1.1.43.1.8.1.2';
+    $sensors_id = snmp_walk($device, $sensors_id_oid, '-Ovq');
+
+    foreach (explode("\n", $sensors_id) as $sensor) {
+        $descr = 'Temperature '.$sensor.':';
+        //EdgeSwitch-BOXSERVICES-PRIVATE-MIB::boxServicesTempSensorTemperature
+        $sensor_id_oid = '.1.3.6.1.4.1.4413.1.1.43.1.8.1.5.1.'.$sensor;
+        $current_value = trim(snmp_get($device, $sensor_id_oid, '-Oqv'));
+
+        if ($current_value > 0) {
+            discover_sensor($valid['sensor'], 'temperature', $device, $sensor_id_oid, $sensor, $sensor_type, $descr, 1, 1, null, null, null, null, $current_value);
+        }
+    }
+}