From 76920956a999836362cf3ebf06b42a13fb25e85f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Rosiak?= Date: Wed, 8 Jun 2016 21:26:59 +0200 Subject: [PATCH] HWg Additions / Changes #3606 And some changes to existing code. --- html/images/os/hwg-poseidon.png | Bin 0 -> 1218 bytes html/images/os/hwg.png | Bin 0 -> 712 bytes html/images/os/poseidon.png | Bin 18951 -> 0 bytes includes/definitions.inc.php | 14 +- ...{poseidon.inc.php => hwg-poseidon.inc.php} | 4 +- includes/discovery/os/hwg-ste.inc.php | 17 ++ ...{poseidon.inc.php => hwg-poseidon.inc.php} | 0 mibs/STE-MIB | 160 ++++++++++++++++++ 8 files changed, 190 insertions(+), 5 deletions(-) create mode 100644 html/images/os/hwg-poseidon.png create mode 100644 html/images/os/hwg.png delete mode 100644 html/images/os/poseidon.png rename includes/discovery/os/{poseidon.inc.php => hwg-poseidon.inc.php} (94%) create mode 100644 includes/discovery/os/hwg-ste.inc.php rename includes/polling/os/{poseidon.inc.php => hwg-poseidon.inc.php} (100%) create mode 100644 mibs/STE-MIB diff --git a/html/images/os/hwg-poseidon.png b/html/images/os/hwg-poseidon.png new file mode 100644 index 0000000000000000000000000000000000000000..5762618092a22c8fa547bd45919429cf83a17329 GIT binary patch literal 1218 zcmV;z1U>tSP)Urd!{9LGP;`<{Pr zI0FSdB7}6t5etr5f!1_3h2@Z@YqQmKYwI6Z*bNsMW^LSX-mHVVgAC7)lYY zjhdX&ffq4{6$)d}1U&N3^B&H7p67kK$a$AV!Mx#n|2+Hb`~CgC&m*+fnnx&uN32zV zRe)81M-JfnFNY>)7di9I5N&;~J%F%rB{V?yg4luJ| z!s%=EFNIESKj z8Ke>^zCB)v%M^^q;z*^J7vPV(2@4R|Oo&Sv7Sh08RUjoXwKW>J5(pV@elwHZDPA(q#H%>|hN z*h(=tI?L;oVd9GtQwZwzZ)S9Afs}FpL8jl0&topH12xa&bGmB?!!SwMir1bG5nq&~ zdtIb?P2Ow0hMiK_%3=4D>z98BU)Z*RXG?Nfv=ujRFYw958;nlh_FISEdQ?E+pAnf04oOe1741`UIPt_w&dp%HSE}wvocM%HsIyz ziTzYRoev1KqXB`PQfv!lGw|_CY!Bxw?J>~zW!tuHZf@45Y3jztMy-_657Rwc>!#)w z-SE*VePi0ko77 z4=KuuAETlyM0SRY@$qr4T)BedI804V0T7GD7#ka7c6RpPMPL{Pg@uKL!(m!mTM30i zR8>{c)z!tCHERe4gA5K1;&!{KtgPhx`SV1hKT%Ut!@+|G(OOeqUr#U?WbfX+baZsE zapOjg965qzS^o@>NF?a&>|}U&nBLxAdU|>Y1Ol8qd6K%iI+~iAxOC|f<>lp6R8-L2 z-OcduFnM`-w6wI4m6b(%dpnk8(bw09ZQC?8HL-K&PNLE1!vTa4NGUN4gF}Z7v1Q8^ zq?A~eMO#}Nwrx{eTg$}61S2CO#N%-ykqA;s($dlp_nXf!3_KnWZnqn)HA*Rj5EzE> z@FH>?2d~%5fddC9Dk`F&pn!&k2BxQ{>FVlYdU~3Sj10ozFtJz+%d*f~lbxN-_3PK^ z=;$C63Q=5K%)Wj5@caGv{eC7VCov4;!7Tl44`{8KnVG?H9CC90TBY9JUP?<#$<58> z!i5VI6%`SQL>L+xLP|+~em+Vmlv0e3j}r(4C@CqSv$K=x>T2fZ=8#e%gdjaVoj@S) g|B7h!TfP$d6Kljsvv+>4=>Px#07*qoM6N<$f-P)B-~a#s literal 0 HcmV?d00001 diff --git a/html/images/os/hwg.png b/html/images/os/hwg.png new file mode 100644 index 0000000000000000000000000000000000000000..1e19ba056ccd22778c159514ef6d96ba1c4d87fe GIT binary patch literal 712 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 + * 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'; + } +} diff --git a/includes/polling/os/poseidon.inc.php b/includes/polling/os/hwg-poseidon.inc.php similarity index 100% rename from includes/polling/os/poseidon.inc.php rename to includes/polling/os/hwg-poseidon.inc.php diff --git a/mibs/STE-MIB b/mibs/STE-MIB new file mode 100644 index 0000000000..4f7e1bdb16 --- /dev/null +++ b/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