device: Added sensor state support for HWg STE2 and added new logos (#7729)

* device: Changing HWg STE2 to YAML and adding new logos

* small logo change

* add again all modules

* change indexes

* update index for state

html/images/logos/hwg.svg

@@ -0,0 +1 @@
+<svg version="1.2" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 737 176.1"><title>hw</title><path fill="#00B0EA" d="M38.1 1.3c1 4.4.4 8.9.4 13.4.1 19.3.1 38.6 0 58 0 3.4.7 4.6 4.3 4.5 10-.2 20-.2 30 0 3.7.1 4.3-1.3 4.3-4.6 0-22.1.2-44.3-.1-66.4-.1-5 1.4-6.1 6.1-5.9 9 .4 18 .4 27 0 4.5-.2 5.9.9 5.8 5.7-.2 34.5-.1 69-.1 103.4 0 19.8-.1 39.6.1 59.4 0 3.8-1.1 4.8-4.8 4.7-9.8-.3-19.7-.3-29.5 0-3.9.1-4.6-1.3-4.6-4.8.2-22.3 0-44.6.2-67 0-4.2-1.3-5.3-5.3-5.2-9.2.3-18.3.3-27.5 0-4.4-.2-6 .9-5.9 5.7.3 22 0 44 .2 65.9 0 4.1-1 5.4-5.2 5.3-11.3-.3-22.4-.1-33.6-.1v-2c1-1.7.5-3.6.5-5.4V6.3C.4.8.4.7 5.7.8c10.9.3 21.7-.4 32.4.5z"/><path fill="#0EB4EB" d="M38.1 1.3c-10.7 0-21.3.2-32 0C1.8 1.2.9 2.7.9 6.7c.1 53 .1 106 0 159 0 1.9.8 4-1 5.7V.4h33.6c1.6 0 3.5-.9 4.6.9z"/><path fill="#00B0EA" d="M553 .1c59.5 0 119 0 178.5-.1 4.3 0 5.6 1 5.5 5.5-.3 21.5-.2 43 0 64.5 0 3.5-.9 4.5-4.4 4.5-120-.1-240-.1-359.9 0-3.2 0-4.2-.7-4.2-4.2.2-21.7.1-43.3-.1-65 0-4.2 1.1-5.3 5.2-5.3 59.8.2 119.6.2 179.4.1zM154.3 86.4c0-27.2.1-54.3-.1-81.5 0-3.8 1-4.8 4.7-4.7 9.8.3 19.7.3 29.5 0 4.2-.2 4.8 1.4 4.8 5.1-.1 47.7 0 95.3-.2 143 0 5 1.4 6.1 6.1 5.9 9.5-.4 19-.2 28.5-.1 2.9.1 3.9-.6 3.9-3.9-.1-48.1-.1-96.3-.2-144.5 0-4.2.8-5.8 5.4-5.6 9.1.4 18.3.4 27.5 0 4.7-.2 6.1.9 6.1 5.9-.2 47.5 0 95-.2 142.5 0 4.9 1.6 5.3 5.9 5.7 9.1 1 15.2-2.7 21.9-8.8 8.4-7.6 11.3-15.5 11.1-26.8-.7-37.8-.2-75.6-.4-113.5 0-4.3 1.2-5.2 5.2-5 9.8.3 19.7.2 29.5 0 2.8 0 4.1.4 4.1 3.7-.1 39-.1 78 0 117 .1 1.8-.7 3.6-2 4.8-15.2 15.1-30.4 30.3-45.6 45.5-1.4 1.4-3.3 2.2-5.3 2.1-45.3-.1-90.7-.1-136 0-3.8 0-4.3-1.4-4.3-4.7.1-27.1.1-54.6.1-82.1z"/><path fill="#4A4A4A" d="M423.8 129.4c0 9 .1 18 0 27-.1 13.4-6.2 19.5-19.7 19.6-5.8 0-11.7.6-17.5-.5-6.6-1.2-11.2-5-13.2-11.5-.5-1.5-1.9-4.2.5-4.7s5.9-2 7.5 1.5c2.4 5.2 6.5 6.6 11.8 6.5 2-.1 4 0 6 0 7.6 0 7.7 0 7.6-7.6-.1-8.3 1-6.9-7.2-7-3.8-.1-7.7.1-11.5-.2-8.6-.7-14.9-7.1-15.2-15.7-.3-8.1-.3-16.3 0-24.5.4-8.9 7.6-16 16.6-16.2 10.3-.3 20.7 0 31-.1 3.2 0 3.5 1.4 3.4 4-.2 9.7-.1 19.6-.1 29.4zM680.4 134.2c0-11.3.1-22.7-.1-34 0-3.2.7-4.4 4.2-4.3 9.7.2 19.3 0 29 .1 10 .1 17.5 7 17.9 17.1.4 8.3.4 16.7 0 25-.5 10.1-7.6 16.9-17.8 17.3-4.3.2-8.7.2-13 0-2.4-.1-3.2.8-3.2 3.2.1 3.2-.2 6.4.1 9.5.4 3.7-1.2 4.3-4.5 4.3-12.7-.1-12.7 0-12.7-12.7l.1-25.5zM649 125.9c0 8.7-.1 17.3.1 26 .1 2.9-.9 3.7-3.7 3.6-9.8-.1-19.7.1-29.5-.1-11.2-.3-17.8-7.3-17.9-18.5-.1-12.3.1-24.6-.1-37 0-3 .7-3.9 3.9-4 13.3-.2 13.3-.3 13.3 13 0 11.2.1 22.3-.1 33.5 0 3 .4 4.3 4 4.4 13 .1 13 .2 13-12.8 0-11.3.1-22.6-.1-34 0-3 .7-3.9 3.8-4 13.3-.2 13.3-.3 13.3 13v16.9zM569.1 125.7c0 4.3.2 8.7 0 13-.4 9.2-6.4 15.7-15.6 16.4-6.5.5-13 .5-19.4 0-9.5-.7-15.7-7.6-15.8-17.3-.1-8.1-.1-16.3 0-24.5.2-9.8 7.3-17.1 17-17.4 5.7-.2 11.3-.2 17 0 9.9.3 16.7 7.2 17 17.2.1 4.2 0 8.3 0 12.5h-.2zM472.8 103.7c6.4-4.6 14-7.2 21.8-7.6 2.2-.1 3.8.2 3.3 2.8-.4 2 1.9 5.3-2.5 5.7-6.8.6-13.4 2.8-19.2 6.5-2.5 1.3-4 4-3.8 6.9.2 11.1-.1 22.3.2 33.5.1 3.4-1 4.1-4.2 4.1-13 0-13 .1-13-12.8 0-14.2.1-28.3-.1-42.5 0-3.2.7-4.7 4.1-4.2 1.8.1 3.7.1 5.5 0 7.3-.1 7.3-.1 7.9 7.6z"/><path fill="#FDFDFD" d="M406.8 124.9c0 5.1-.1 10.3 0 15.4.1 2.8-.7 3.7-3.6 3.8-13.4.5-13.4.6-13.4-12.8 0-7.5.1-15-.1-22.4-.1-3.1.6-4.3 4.1-4.3 12.9-.1 12.9-.2 12.9 12.8.1 2.5.1 5 .1 7.5zM714.3 125.8c0 5.8-.1 11.6 0 17.4.1 2.6-.8 3.3-3.4 3.4-13.5.5-13.5.6-13.5-12.7 0-8.5.1-16.9-.1-25.4-.1-3.1.9-3.9 3.9-4 13-.2 13-.3 13 12.8l.1 8.5zM552.1 125.7c0 5.5-.2 11 .1 16.5.2 3.4-.7 4.6-4.3 4.6-12.7-.1-12.7.1-12.7-12.6 0-8.6.1-17.3 0-25.9 0-2.5.7-3.4 3.3-3.5 13.7-.7 13.7-.8 13.7 12.6-.1 2.6-.1 5.4-.1 8.3z"/></svg>

html/images/os/hwg.svg

@@ -0,0 +1 @@
+<svg version="1.2" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 347.3 189"><path fill="#00B0EA" d="M39.1 8.9c1 4.4.4 8.9.4 13.4.1 19.3.1 38.6 0 58 0 3.4.7 4.6 4.3 4.5 10-.2 20-.2 30 0 3.7.1 4.3-1.3 4.3-4.6-.1-22.2.1-44.3-.2-66.5-.1-5 1.4-6.1 6.1-5.9 9 .4 18 .4 27 0 4.5-.2 5.9.9 5.8 5.7-.2 34.5-.1 69-.1 103.4 0 19.8-.1 39.6.1 59.5 0 3.8-1.1 4.8-4.8 4.7-9.8-.3-19.7-.3-29.5 0-3.9.1-4.6-1.3-4.6-4.8.2-22.3 0-44.6.2-67 0-4.3-1.3-5.3-5.3-5.2-9.2.3-18.3.3-27.5 0-4.4-.2-6 .9-5.9 5.7.3 22 0 44 .2 66 0 4.1-1 5.4-5.2 5.3-11.1-.2-22.2-.1-33.4-.1v-2c1-1.7.5-3.6.5-5.4V14c0-5.5 0-5.6 5.3-5.5 10.8.2 21.6-.5 32.3.4z"/><path fill="#0EB4EB" d="M39.1 8.9c-10.7 0-21.3.2-32 0-4.3-.1-5.2 1.4-5.2 5.4.1 53 .1 106 0 159 0 1.9.8 4-1 5.7C1 122 1 65 1 8c11.2 0 22.4-.1 33.6 0 1.5 0 3.3-.9 4.5.9z"/><path fill="#00B0EA" d="M155.3 94c0-27.2.1-54.3-.1-81.5 0-3.8 1-4.8 4.7-4.7 9.8.3 19.7.3 29.5 0 4.2-.1 4.8 1.4 4.8 5.1-.1 47.7 0 95.3-.2 143 0 5 1.4 6.1 6.1 5.9 9.5-.4 19-.2 28.5-.1 2.9 0 4-.6 3.9-3.9-.1-48.2 0-96.3-.2-144.5 0-4.2.8-5.8 5.4-5.6 9.1.4 18.3.4 27.5 0 4.7-.2 6.1.9 6.1 5.9-.2 47.5 0 95-.3 142.5 0 4.9 1.7 5.3 5.9 5.7 9.1 1 15.2-2.7 21.9-8.8 8.4-7.6 11.3-15.5 11.1-26.8-.7-37.8-.2-75.6-.4-113.5 0-4.3 1.2-5.2 5.2-5.1 9.8.3 19.7.2 29.5.1 2.8 0 4.1.4 4.1 3.7-.1 39-.1 78 0 117 0 2-.6 3.4-2 4.8-15.2 15.2-30.4 30.4-45.5 45.6-1.5 1.6-3.2 2.1-5.3 2.1-45.3 0-90.6-.1-136 0-3.8 0-4.3-1.5-4.3-4.7.1-27.2.1-54.7.1-82.2z"/></svg>

includes/definitions/discovery/hwg-ste2.yaml

@@ -0,0 +1,43 @@
+mib: STE2-MIB
+modules:
+    sensors:
+        temperature:
+            data:
+                -
+                    oid: sensTable
+                    value: sensValue
+                    num_oid: .1.3.6.1.4.1.21796.4.9.3.1.5.
+                    descr: sensName
+                    index: '{{ $index }}'
+                    divisor: 10
+                    skip_values: 
+                        -
+                            oid: sensUnit
+                            op: '!='
+                            value: 1
+        humidity:
+            data:
+                -
+                    oid: sensTable
+                    value: sensValue
+                    num_oid: .1.3.6.1.4.1.21796.4.9.3.1.5.
+                    descr: sensName
+                    index: '{{ $index }}'
+                    divisor: 10
+                    skip_values: 
+                        -
+                            oid: sensUnit
+                            op: '!='
+                            value: 4
+        state:
+            data:
+                -
+                    oid: inpTable
+                    value: inpAlarmState
+                    num_oid: .1.3.6.1.4.1.21796.4.9.1.1.4.
+                    descr: 'Alarm: {{ $inpName }}'
+                    index: 'inpAlarmState.{{ $index }}'
+                    state_name: inpAlarmState
+                    states:
+                        - { descr: normal, graph: 0, value: 0, generic: 0 }
+                        - { descr: alarm, graph: 0, value: 1, generic: 2 }

includes/definitions/hwg-ste2.yaml

@@ -4,9 +4,9 @@ type: environment
 icon: hwg
 over:
     - { graph: device_temperature, text: Temperature }
-    - { graph: device_humidity, text: Humidity }
 mib_dir:
     - hwg
+nobulk: 1
 discovery:
     - sysObjectId:
         - .1.3.6.1.4.1.21796.4.9

includes/discovery/sensors/humidity/hwg-ste2.inc.php

@@ -1,21 +0,0 @@
-<?php
-/*
- * LibreNMS
- *
- * 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.
- */
-
-d_echo('HWg STE2 Humidity ');
-$oid = '.1.3.6.1.4.1.21796.4.9.3.1.4.1';
-$sensorType = 'ste2_humidity';
-$descr = 'Input 1 Humidity';
-$humidity = snmp_get($device, $oid, '-Osqnv');
-
-if ($humidity !== false) {
-    discover_sensor($valid['sensor'], 'humidity', $device, $oid, '1', $sensorType, $descr, '1', '1', null, null, null, null, $humidity);
-}

includes/discovery/sensors/temperature/hwg-ste2.inc.php

@@ -1,21 +0,0 @@
-<?php
-/*
- * LibreNMS
- *
- * 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.
- */
-
-d_echo('HWg STE2 Temperature ');
-$oid = '.1.3.6.1.4.1.21796.4.9.3.1.4.2';
-$sensorType = 'ste2_temp';
-$descr = 'Input 2 Temperature';
-$temperature = snmp_get($device, $oid, '-Osqnv');
-
-if ($temperature !== false) {
-    discover_sensor($valid['sensor'], 'temperature', $device, $oid, '1', $sensorType, $descr, '1', '1', null, null, null, null, $temperature);
-}

mibs/hwg/STE2-MIB

@@ -0,0 +1,231 @@
+--	STE2 MIB 1.01
+--		History:
+--
+--		1.00	 8.9.2015 Marek Hummel  - Created
+--		1.01	 20.3.2017 Marek Hummel  - FIX.    STE-MIB DEFINITIONS => STE2-MIB DEFINITIONS
+
+
+STE2-MIB DEFINITIONS ::= BEGIN
+IMPORTS
+	OBJECT-TYPE				FROM RFC-1212
+	enterprises				FROM RFC1155-SMI
+	DisplayString			FROM RFC1213-MIB;
+
+--
+-- Type Definitions
+--
+PositiveInteger ::= INTEGER (1..2147483647)	-- 0x7FFF FFFF
+
+UnitType ::= INTEGER {
+		none (0),
+		celsius (1),
+		fahrenheit (2),
+		kelvin (3),
+		percent(4)
+	}
+
+OnOff ::= INTEGER {
+		off (0),
+		on (1)
+	}
+
+InputAlarmState ::= INTEGER {
+		normal (0),
+		alarm (1)
+	}
+
+IOName ::= DisplayString (SIZE (0..16))
+
+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 }
+ste2		OBJECT IDENTIFIER ::= { x390 9 }
+
+-- Application Info ------------------------------------------------------------
+
+info		OBJECT IDENTIFIER ::= { ste2 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 }
+
+-- Input Dry Contacts ----------------------------------------------------------
+
+inpTable OBJECT-TYPE
+	SYNTAX	SEQUENCE OF InpEntry
+	ACCESS	not-accessible
+	STATUS	mandatory
+	DESCRIPTION
+		"A list of binary input entries."
+	::= { ste2 1 }
+
+inpEntry OBJECT-TYPE
+	SYNTAX	InpEntry
+	ACCESS	not-accessible
+	STATUS	mandatory
+	DESCRIPTION
+		"An entry containing information applicable
+		to a particular binary input."
+	INDEX { inpIndex }
+	::= { inpTable 1 }
+
+InpEntry ::= SEQUENCE {
+	inpIndex	PositiveInteger,
+	inpValue	OnOff,
+	inpName		IOName,
+	inpAlarmState	InputAlarmState
+}
+
+inpIndex OBJECT-TYPE
+	SYNTAX	PositiveInteger
+	ACCESS	not-accessible
+	STATUS	mandatory
+	DESCRIPTION
+		"The binary input index."
+	::= { inpEntry 1 }
+
+inpValue OBJECT-TYPE
+	SYNTAX	OnOff
+	ACCESS	read-only
+	STATUS	mandatory
+	DESCRIPTION
+		"The binary input value."
+	::= { inpEntry 2 }
+
+inpName OBJECT-TYPE
+	SYNTAX	IOName
+	ACCESS	read-only
+	STATUS	mandatory
+	DESCRIPTION
+		"The binary input name."
+	::= { inpEntry 3 }
+
+inpAlarmState OBJECT-TYPE
+	SYNTAX	InputAlarmState
+	ACCESS	read-only
+	STATUS	mandatory
+	DESCRIPTION
+		"The binary input alarm state."
+	::= { inpEntry 4 }
+
+-- Sensors ---------------------------------------------------------------------
+
+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."
+	::= { ste2 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