From 81c4fc324433aef07fec7d512cf9eb63564606c6 Mon Sep 17 00:00:00 2001
From: Rasmus Aberg <rasmus@sthix.net>
Date: Mon, 20 Jul 2015 10:46:35 +0200
Subject: [PATCH 1/3] Added power and temperature sensors for Extreme hardware
 (xos)

---
 includes/discovery/power/extreme.inc.php      | 27 +++++++++++++++++++
 .../discovery/temperatures/extreme.inc.php    | 21 +++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 includes/discovery/power/extreme.inc.php
 create mode 100644 includes/discovery/temperatures/extreme.inc.php

diff --git a/includes/discovery/power/extreme.inc.php b/includes/discovery/power/extreme.inc.php
new file mode 100644
index 000000000..bc839d132
--- /dev/null
+++ b/includes/discovery/power/extreme.inc.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Observium
+ *
+ *   This file is part of Observium.
+ *
+ * @package    observium
+ * @subpackage discovery
+ * @copyright  (C) 2006-2014 Adam Armstrong
+ *
+ */
+
+echo(" EXTREME-BASE-MIB ");
+
+// Power Usage
+$descr   = "Power Usage";
+$oid     = "1.3.6.1.4.1.1916.1.1.1.40.1.0"; // extremeSystemPowerUsage
+$value   = snmp_get($device, $oid, '-Oqv', 'EXTREME-BASE-MIB');
+$divisor = "1000";
+$value	 = ($value / $divisor); // Nasty hack to divide the first value by 1000 since the divisor only works for polling after the sensor has been added
+
+if (is_numeric($value) && $value > 0) {
+	discover_sensor($valid['sensor'], 'power', $device, $oid, '1', 'extreme-power', $descr, $divisor, 1, null, null, null, null, $value); // No limits have been specified since all equipment is different and will use different amount of Watts
+}
+
+// EOF
diff --git a/includes/discovery/temperatures/extreme.inc.php b/includes/discovery/temperatures/extreme.inc.php
new file mode 100644
index 000000000..682d843d5
--- /dev/null
+++ b/includes/discovery/temperatures/extreme.inc.php
@@ -0,0 +1,21 @@
+<?php
+
+if ($device['os'] == 'xos') {
+	echo(" EXTREME-BASE-MIB ");
+
+	// Chassis temperature
+	$high_limit		= 65;
+	$high_warn_limit	= 55;
+	$low_warn_limit		= 15;
+	$low_limit		= 5;
+
+	$descr   = "Chassis Temperature";
+	$oid     = "1.3.6.1.4.1.1916.1.1.1.8.0"; // extremeCurrentTemperature
+	$value   = snmp_get($device, $oid, '-Oqv', 'EXTREME-BASE-MIB');
+
+	if (is_numeric($value) && $value > 0) {
+		discover_sensor($valid['sensor'], 'temperature', $device, $oid, 1, 'extreme-temp', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value);
+	}
+}
+
+// EOF

From 0b880bff71fbacfe9cd48938008dc3604f467413 Mon Sep 17 00:00:00 2001
From: Rasmus Aberg <rasmus@sthix.net>
Date: Mon, 20 Jul 2015 10:48:51 +0200
Subject: [PATCH 2/3] Added power and temperature sensors for Extreme hardware
 (xos)

---
 includes/discovery/power/extreme.inc.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/includes/discovery/power/extreme.inc.php b/includes/discovery/power/extreme.inc.php
index bc839d132..21597237d 100644
--- a/includes/discovery/power/extreme.inc.php
+++ b/includes/discovery/power/extreme.inc.php
@@ -1,16 +1,5 @@
 <?php
 
-/**
- * Observium
- *
- *   This file is part of Observium.
- *
- * @package    observium
- * @subpackage discovery
- * @copyright  (C) 2006-2014 Adam Armstrong
- *
- */
-
 echo(" EXTREME-BASE-MIB ");
 
 // Power Usage

From a97160b94f7e7fb270ff8d46391182160d7dd0c5 Mon Sep 17 00:00:00 2001
From: Rasmus Aberg <rasmus@sthix.net>
Date: Mon, 20 Jul 2015 11:01:30 +0200
Subject: [PATCH 3/3] Added power and temperature sensors for Extreme hardware
 (xos). I agree to the conditions of the Contributor Agreement contained in
 doc/General/Contributing.md.

---
 AUTHORS.md                                    |  1 +
 includes/discovery/power/extreme.inc.php      |  4 ++--
 .../discovery/temperatures/extreme.inc.php    | 24 +++++++++----------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 5150a6d0d..0a67718ba 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -39,6 +39,7 @@ Contributors to LibreNMS:
 - Travis Hegner <travis.hegner@gmail.com> (travishegner)
 - Will Jones <email@willjones.eu> (willjones)
 - Job Snijders <job@instituut.net> (job)
+- Rasmus Aberg <rasmus@sthix.net> (rasssta)
 
 [1]: http://observium.org/ "Observium web site"
 
diff --git a/includes/discovery/power/extreme.inc.php b/includes/discovery/power/extreme.inc.php
index 21597237d..39c9ca352 100644
--- a/includes/discovery/power/extreme.inc.php
+++ b/includes/discovery/power/extreme.inc.php
@@ -9,8 +9,8 @@ $value   = snmp_get($device, $oid, '-Oqv', 'EXTREME-BASE-MIB');
 $divisor = "1000";
 $value	 = ($value / $divisor); // Nasty hack to divide the first value by 1000 since the divisor only works for polling after the sensor has been added
 
-if (is_numeric($value) && $value > 0) {
-	discover_sensor($valid['sensor'], 'power', $device, $oid, '1', 'extreme-power', $descr, $divisor, 1, null, null, null, null, $value); // No limits have been specified since all equipment is different and will use different amount of Watts
+if (is_numeric($value)) {
+    discover_sensor($valid['sensor'], 'power', $device, $oid, '1', 'extreme-power', $descr, $divisor, 1, null, null, null, null, $value); // No limits have been specified since all equipment is different and will use different amount of Watts
 }
 
 // EOF
diff --git a/includes/discovery/temperatures/extreme.inc.php b/includes/discovery/temperatures/extreme.inc.php
index 682d843d5..ae1cf86b1 100644
--- a/includes/discovery/temperatures/extreme.inc.php
+++ b/includes/discovery/temperatures/extreme.inc.php
@@ -1,21 +1,21 @@
 <?php
 
 if ($device['os'] == 'xos') {
-	echo(" EXTREME-BASE-MIB ");
+    echo(" EXTREME-BASE-MIB ");
 
-	// Chassis temperature
-	$high_limit		= 65;
-	$high_warn_limit	= 55;
-	$low_warn_limit		= 15;
-	$low_limit		= 5;
+    // Chassis temperature
+    $high_limit		= 65;
+    $high_warn_limit	= 55;
+    $low_warn_limit		= 15;
+    $low_limit		= 5;
 
-	$descr   = "Chassis Temperature";
-	$oid     = "1.3.6.1.4.1.1916.1.1.1.8.0"; // extremeCurrentTemperature
-	$value   = snmp_get($device, $oid, '-Oqv', 'EXTREME-BASE-MIB');
+    $descr   = "Chassis Temperature";
+    $oid     = "1.3.6.1.4.1.1916.1.1.1.8.0"; // extremeCurrentTemperature
+    $value   = snmp_get($device, $oid, '-Oqv', 'EXTREME-BASE-MIB');
 
-	if (is_numeric($value) && $value > 0) {
-		discover_sensor($valid['sensor'], 'temperature', $device, $oid, 1, 'extreme-temp', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value);
-	}
+    if (is_numeric($value)) {
+        discover_sensor($valid['sensor'], 'temperature', $device, $oid, 1, 'extreme-temp', $descr, '1', '1', $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $value);
+    }
 }
 
 // EOF