Merge branch 'master' of https://github.com:/wiad/librenms into issue-3615

doc/Support/Configuration.md

@@ -210,7 +210,7 @@ Disable the footer of the WebUI by setting `enable_footer` to 0.
 You can enable the old style network map (only available for individual devices with links discovered via xDP) by setting:
 ```php
 $config['gui']['network-map']['style'] = 'old';
-````
+```
 
 #### Add host settings
 The following setting controls how hosts are added.  If a host is added as an ip address it is checked to ensure the ip is not already present.  If the ip is present the host is not added.

includes/definitions.inc.php

@@ -1045,6 +1045,17 @@ $config['os'][$os]['text'] = 'Blade Network Technologies';
 $config['os'][$os]['type'] = 'network';
 $config['os'][$os]['icon'] = 'bnt';
 
+$os = 'ibm-imm';
+$config['os'][$os]['text']             = 'IBM IMM';
+$config['os'][$os]['type']             = 'appliance';
+$config['os'][$os]['icon']             = 'ibmnos';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = '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';
+
 $os = 'ibmnos';
 $config['os'][$os]['text']             = 'IBM Networking Operating System';
 $config['os'][$os]['type']             = 'network';
@@ -1059,6 +1070,13 @@ $config['os'][$os]['icon']             = 'generic';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Traffic';
 
+$os = 'informos';
+$config['os'][$os]['text']             = 'HPE 3PAR';
+$config['os'][$os]['type']             = 'storage';
+$config['os'][$os]['icon']             = 'hp';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Traffic';
+
 $os = 'comware';
 $config['os'][$os]['text']             = 'HP Comware';
 $config['os'][$os]['type']             = 'network';
@@ -1634,10 +1652,18 @@ $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Traffic';
 
 // HWGroup Poseidon
-$os = 'poseidon';
-$config['os'][$os]['text']             = 'Poseidon';
+$os = 'hwg-poseidon';
+$config['os'][$os]['text']             = 'HWg Poseidon';
 $config['os'][$os]['type']             = 'environment';
-$config['os'][$os]['icon']             = 'poseidon';
+$config['os'][$os]['icon']             = 'hwg-poseidon';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Traffic';
+
+// HWGroup STE
+$os = 'hwg-ste';
+$config['os'][$os]['text']             = 'HWg STE';
+$config['os'][$os]['type']             = 'environment';
+$config['os'][$os]['icon']             = 'hwg';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Traffic';
 

includes/discovery/os/hp3par.inc.php

@@ -0,0 +1,17 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2016 Søren Friis Rosiak <sorenrosiak@gmail.com> 
+ * 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 (!$os) {
+    if (strstr($sysObjectId, '.1.3.6.1.4.1.12925.1')) {
+        $os = 'informos';
+    }
+}

includes/discovery/os/hwg-poseidon.inc.php

@@ -12,6 +12,6 @@
 
 if (!$os) {
     if (strstr($sysObjectId, '.1.3.6.1.4.1.21796.3.3')) {
-        $os = 'poseidon';
+        $os = 'hwg-poseidon';
     }
-}
+}

includes/discovery/os/hwg-ste.inc.php

@@ -0,0 +1,17 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2016 Søren Friis Rosiak <sorenrosiak@gmail.com> 
+ * 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 (!$os) {
+    if (strstr($sysObjectId, '.1.3.6.1.4.1.21796.4.1')) {
+        $os = 'hwg-ste';
+    }
+}

includes/discovery/os/ibm-imm.inc.php

@@ -0,0 +1,17 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2016 Søren Friis Rosiak <sorenrosiak@gmail.com> 
+ * 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 (!$os) {
+    if (strstr($sysObjectId, '1.3.6.1.4.1.2.3.51.3')) {
+        $os = 'ibm-imm';
+    }
+}

includes/discovery/os/ibmnos.inc.php

@@ -11,7 +11,7 @@
  */
 
 if (!$os) {
-    if (stristr($sysDescr, 'IBM Networking Operating System') || stristr($sysDescr, 'IBM Flex System Fabric')) {
+    if (stristr($sysDescr, 'IBM Networking Operating System') || stristr($sysDescr, 'IBM Flex System Fabric') || stristr($sysDescr, 'IBM Networking OS')) {
         $os = 'ibmnos';
     }
 }

includes/discovery/os/linux.inc.php

@@ -4,7 +4,8 @@ if (!$os) {
     $skip_oids = array(
         '.1.3.6.1.4.1.674.10892.2',
         '.1.3.6.1.4.1.17163.1.1',
-        '.1.3.6.1.4.1.17713.21'
+        '.1.3.6.1.4.1.17713.21',
+        '.1.3.6.1.4.1.2.3.51.3'
     );
     if (preg_match('/^Linux/', $sysDescr) && !in_array($sysObjectId, $skip_oids)) {
         $os = 'linux';

includes/polling/os/hp3par.inc.php

@@ -0,0 +1,17 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2016 Neil Lathwood <neil@lathwood.co.uk>
+ * 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 (preg_match('/^HP_3PAR (.*), ID: (.*), Serial number: (.*), InForm OS version: (.*)/', $poll_device['sysDescr'], $regexp_result)) {
+    $hardware = 'HP 3Par '.$regexp_result[1];
+    $serial = $regexp_result[3];
+    $version  = $regexp_result[4];
+}

includes/polling/os/ibmnos.inc.php

@@ -45,3 +45,6 @@ else if (strpos($sysdescr_value, 'IBM Flex System Fabric') !== false) {
     $version  = trim(snmp_get($device, '.1.3.6.1.2.1.47.1.1.1.1.10.1', '-Ovq'), '" ');
     $serial   = trim(snmp_get($device, '.1.3.6.1.2.1.47.1.1.1.1.11.1', '-Ovq'), '" ');
 }//end if
+else if (strpos($sysdescr_value, 'IBM Networking OS 1/10Gb Uplink Ethernet Switch Module') !== false) {
+    $hardware = "IBM BladeCenter 1/10Gb Uplink Ethernet Switch Module";
+}//end if

mibs/STE-MIB

@@ -0,0 +1,160 @@
+--	HWg-STE MIB 1.02
+--		History:
+--
+--		1.00	 08.12.2008 Marek Hummel  - Created
+--		1.01	 03.08.2009 Marek Hummel  - Add SensorID, Change SensorState values
+--		1.02	 14.05.2010 Marek Hummel  - Fix Syntax
+--
+
+STE-MIB DEFINITIONS ::= BEGIN
+IMPORTS
+	OBJECT-TYPE				FROM RFC-1212
+	enterprises				FROM RFC1155-SMI
+	DisplayString,sysName	FROM RFC1213-MIB
+	TRAP-TYPE				FROM RFC-1215;
+
+--
+-- Type Definitions
+--
+PositiveInteger ::= INTEGER (1..2147483647)	-- 0x7FFF FFFF
+
+UnitType ::= INTEGER {
+		none (0),
+		celsius (1),
+		fahrenheit (2),
+		kelvin (3),
+		percent(4)
+	}
+
+SensorState ::= INTEGER {
+		invalid (0),
+		normal (1),
+		outofrangelo (2),
+		outofrangehi (3),
+		alarmlo (4),
+		alarmhi (5)
+	}
+
+SensorSN ::= DisplayString (SIZE (0..16))
+SensorName ::= DisplayString (SIZE (0..16))
+SensorValue ::= INTEGER
+SensorID ::= INTEGER
+SensorString ::= DisplayString (SIZE (0..10))
+
+--
+-- Node Definitions
+--
+
+hwgroup		OBJECT IDENTIFIER ::= { enterprises 21796 }
+x390		OBJECT IDENTIFIER ::= { hwgroup 4 }
+ste			OBJECT IDENTIFIER ::= { x390 1 }
+
+-- Application Info
+info		OBJECT IDENTIFIER ::= { ste 70 }
+
+infoAddressMAC OBJECT-TYPE
+	SYNTAX	DisplayString (SIZE (0..17))
+	ACCESS	read-only
+	STATUS	mandatory
+	DESCRIPTION
+		"MAC address in text form.
+		It is here to distinguish devices in trap messages."
+	::= { info 1 }
+
+-- Table has to be last in a branch to satisfy snmp walk engine implementation
+sensTable OBJECT-TYPE
+	SYNTAX	SEQUENCE OF SensEntry
+	ACCESS	not-accessible
+	STATUS	mandatory
+	DESCRIPTION
+		"A list of sensor table entries. The number
+		of entries corresponds with number of detected sensors."
+	::= { ste 3 }
+
+sensEntry OBJECT-TYPE
+	SYNTAX	SensEntry
+	ACCESS	not-accessible
+	STATUS	mandatory
+	DESCRIPTION
+		"An entry containing information applicable to a
+		particular sensor."
+	INDEX { sensIndex }
+	::= { sensTable 1 }
+
+SensEntry ::= SEQUENCE {
+	sensIndex	PositiveInteger,
+	sensName	SensorName,
+	sensState	SensorState,
+	sensString	SensorString,
+	sensValue	SensorValue,
+	sensSN		SensorSN,
+	sensUnit	UnitType,
+	sensID		SensorID
+}
+
+sensIndex OBJECT-TYPE
+	SYNTAX	PositiveInteger
+	ACCESS	not-accessible
+	STATUS	mandatory
+	DESCRIPTION
+		"The sensor index."
+	::= { sensEntry 1 }
+
+sensName OBJECT-TYPE
+	SYNTAX	SensorName
+	ACCESS	read-only
+	STATUS	mandatory
+	DESCRIPTION
+		"The sensor name."
+	::= { sensEntry 2 }
+
+sensState OBJECT-TYPE
+	SYNTAX	SensorState
+	ACCESS	read-only
+	STATUS	mandatory
+	DESCRIPTION
+		"The sensor state."
+	::= { sensEntry 3 }
+
+sensString OBJECT-TYPE
+	SYNTAX	SensorString
+	ACCESS	read-only
+	STATUS	mandatory
+	DESCRIPTION
+		"The string representation of sensor value."
+	::= { sensEntry 4 }
+
+sensValue OBJECT-TYPE
+	SYNTAX	SensorValue
+	ACCESS	read-only
+	STATUS	mandatory
+	DESCRIPTION
+		"The integer (decimal * 10) representation
+		of sensor value."
+	::= { sensEntry 5 }
+
+sensSN OBJECT-TYPE
+	SYNTAX	SensorSN
+	ACCESS	read-only
+	STATUS	mandatory
+	DESCRIPTION
+		"The sensor Serial number."
+	::= { sensEntry 6 }
+
+sensUnit OBJECT-TYPE
+	SYNTAX	UnitType
+	ACCESS	read-only
+	STATUS	mandatory
+	DESCRIPTION
+		"The sensor unit."
+	::= { sensEntry 7 }
+
+sensID OBJECT-TYPE
+	SYNTAX	UnitType
+	ACCESS	read-only
+	STATUS	mandatory
+	DESCRIPTION
+		"The sensor ID."
+	::= { sensEntry 8 }
+
+END