mirror of
				https://github.com/librenms/librenms.git
				synced 2024-10-07 16:52:45 +00:00 
			
		
		
		
	Add support for Moxa EDS-G512E-8PoE (#9857)
* Add support for MOXA EDSG512E8-PoE * Add support for MOXA EDS-G512E-8PoE * Add support for MOXA EDS-G512E-8PoE * Remove whitespace * Create MOXA-EDSG512E8POE-MIB * Delete MOXA-EDSG512E8POE-MIB * Create MOXA-EDSG512E8POE-MIB * Delete MOXA-EDSG512E8POE-MIB * Create MOXA-EDSG512E8POE-MIB * Update moxa-etherdevice.yaml * Create moxa-etherdevice_edsg512epoe.snmprec * Create moxa-etherdevice_edsg512epoe.json * Add support for MOXA EDSG512E8-PoE * Add support for MOXA EDS-G512E-8PoE * Add support for MOXA EDS-G512E-8PoE * Remove whitespace * Create MOXA-EDSG512E8POE-MIB * Delete MOXA-EDSG512E8POE-MIB * Create MOXA-EDSG512E8POE-MIB * Delete MOXA-EDSG512E8POE-MIB * Create MOXA-EDSG512E8POE-MIB * Update moxa-etherdevice.yaml * Revert "Add Moxa EDS-G512E-8PoE test data" * Add test data for Moxa EDS-G512E-8PoE * Removed whitespace * Update moxa-etherdevice_edsg512epoe.json * Update moxa-etherdevice_edsp510a8poe.json
This commit is contained in:
		@@ -1,4 +1,4 @@
 | 
			
		||||
mib: IF-MIB:MOXA-IKS6726A-MIB:MOXA-EDSG508E-MIB:MOXA-EDSP510A8POE-MIB
 | 
			
		||||
mib: IF-MIB
 | 
			
		||||
modules:
 | 
			
		||||
    sensors:
 | 
			
		||||
        pre-cache:
 | 
			
		||||
@@ -8,57 +8,112 @@ modules:
 | 
			
		||||
        power:
 | 
			
		||||
            data:
 | 
			
		||||
                -
 | 
			
		||||
                    oid: powerConsumption
 | 
			
		||||
                    oid: MOXA-IKS6726A-MIB::powerConsumption
 | 
			
		||||
                    num_oid: '.1.3.6.1.4.1.8691.7.116.1.10.8.{{ $index }}'
 | 
			
		||||
                    descr: 'Power Consumption'
 | 
			
		||||
                    index: 'powerConsumption.{{ $index }}'
 | 
			
		||||
                    value: powerConsumption
 | 
			
		||||
                -
 | 
			
		||||
                    oid: powerConsumption
 | 
			
		||||
                    oid: MOXA-EDSG508E-MIB::powerConsumption
 | 
			
		||||
                    num_oid: '.1.3.6.1.4.1.8691.7.69.1.10.8.{{ $index }}'
 | 
			
		||||
                    descr: 'Power Consumption'
 | 
			
		||||
                    index: 'powerConsumption.{{ $index }}'
 | 
			
		||||
                    value: powerConsumption
 | 
			
		||||
                -
 | 
			
		||||
                    oid: poePortConsumption
 | 
			
		||||
                    oid: MOXA-EDSP510A8POE-MIB::poePortConsumption
 | 
			
		||||
                    num_oid: '.1.3.6.1.4.1.8691.7.86.1.40.6.1.2.{{ $index }}'
 | 
			
		||||
                    descr: '{{ $ifDescr }} PoE Consumption'
 | 
			
		||||
                    index: 'poePortConsumption.{{ $index }}'
 | 
			
		||||
                    value: poePortConsumption
 | 
			
		||||
                    high_limit: 36.0
 | 
			
		||||
                -
 | 
			
		||||
                    oid: MOXA-EDSG512E8POE-MIB::powerConsumption
 | 
			
		||||
                    num_oid: '.1.3.6.1.4.1.8691.7.108.1.10.8.{{ $index }}'
 | 
			
		||||
                    descr: 'Power Consumption'
 | 
			
		||||
                    index: 'powerConsumption.{{ $index }}'
 | 
			
		||||
                    value: powerConsumption
 | 
			
		||||
                    high_limit: 240.0
 | 
			
		||||
                -
 | 
			
		||||
                    oid: MOXA-EDSG512E8POE-MIB::poePortConsumption
 | 
			
		||||
                    num_oid: '.1.3.6.1.4.1.8691.7.108.1.40.6.1.2.{{ $index }}'
 | 
			
		||||
                    descr: '{{ $ifDescr }} PoE Consumption'
 | 
			
		||||
                    index: 'poePortConsumption.{{ $index }}'
 | 
			
		||||
                    value: poePortConsumption
 | 
			
		||||
                    high_limit: 36.0
 | 
			
		||||
        temperature:
 | 
			
		||||
            data:
 | 
			
		||||
                -
 | 
			
		||||
                    oid: sfpTemperature
 | 
			
		||||
                    oid: MOXA-EDSP510A8POE-MIB::sfpTemperature
 | 
			
		||||
                    num_oid: '.1.3.6.1.4.1.8691.7.86.1.10.7.1.3.{{ $index }}'
 | 
			
		||||
                    descr: '{{ $ifDescr }} SFP module temperature'
 | 
			
		||||
                    index: 'sfpTemperature.{{ $index }}'
 | 
			
		||||
                    value: sfpTemperature
 | 
			
		||||
                    low_limit: -40.0
 | 
			
		||||
                    high_limit: 85.0
 | 
			
		||||
                -
 | 
			
		||||
                    oid: MOXA-EDSG512E8POE-MIB::fiberTemperature
 | 
			
		||||
                    num_oid: '.1.3.6.1.4.1.8691.7.108.1.10.11.1.5.{{ $index }}'
 | 
			
		||||
                    descr: '{{ $ifDescr }} SFP module temperature'
 | 
			
		||||
                    index: 'fiberTemperature.{{ $index }}'
 | 
			
		||||
                    value: fiberTemperature
 | 
			
		||||
                    low_limit: -40.0
 | 
			
		||||
                    high_limit: 85.0
 | 
			
		||||
        voltage:
 | 
			
		||||
            data:
 | 
			
		||||
                -
 | 
			
		||||
                    oid: sfpVoltage
 | 
			
		||||
                    oid: MOXA-EDSP510A8POE-MIB::sfpVoltage
 | 
			
		||||
                    num_oid: '.1.3.6.1.4.1.8691.7.86.1.10.7.1.4.{{ $index }}'
 | 
			
		||||
                    descr: '{{ $ifDescr }} SFP module Supply Voltage'
 | 
			
		||||
                    index: 'sfpVoltage.{{ $index }}'
 | 
			
		||||
                    value: sfpVoltage
 | 
			
		||||
                    low_limit: 3.13
 | 
			
		||||
                    high_limit: 3.47
 | 
			
		||||
                -
 | 
			
		||||
                    oid: MOXA-EDSG512E8POE-MIB::fiberVoltage
 | 
			
		||||
                    num_oid: '.1.3.6.1.4.1.8691.7.108.1.10.11.1.4.{{ $index }}'
 | 
			
		||||
                    descr: '{{ $ifDescr }} SFP module Supply Voltage'
 | 
			
		||||
                    index: 'fiberVoltage.{{ $index }}'
 | 
			
		||||
                    value: fiberVoltage
 | 
			
		||||
                    low_limit: 3.13
 | 
			
		||||
                    high_limit: 3.47
 | 
			
		||||
        dbm:
 | 
			
		||||
            data:
 | 
			
		||||
                -
 | 
			
		||||
                    oid: sfpTxPower
 | 
			
		||||
                    oid: MOXA-EDSP510A8POE-MIB::sfpTxPower
 | 
			
		||||
                    num_oid: '.1.3.6.1.4.1.8691.7.86.1.10.7.1.5.{{ $index }}'
 | 
			
		||||
                    descr: '{{ $ifDescr }} SFP module Transmit Power'
 | 
			
		||||
                    index: 'sfpTxPower.{{ $index }}'
 | 
			
		||||
                    value: sfpTxPower
 | 
			
		||||
                    low_limit: -9.0
 | 
			
		||||
                    high_limit: -3.0
 | 
			
		||||
                -
 | 
			
		||||
                    oid: sfpRXPower
 | 
			
		||||
                    oid: MOXA-EDSP510A8POE-MIB::sfpRXPower
 | 
			
		||||
                    num_oid: '.1.3.6.1.4.1.8691.7.86.1.10.7.1.6.{{ $index }}'
 | 
			
		||||
                    descr: '{{ $ifDescr }} SFP module Receive Power'
 | 
			
		||||
                    index: 'sfpRxPower.{{ $index }}'
 | 
			
		||||
                    value: sfpRXPower
 | 
			
		||||
                    low_limit: -21.0
 | 
			
		||||
                    high_limit: -3.0
 | 
			
		||||
                -
 | 
			
		||||
                    oid: MOXA-EDSG512E8POE-MIB::fiberTxPower
 | 
			
		||||
                    num_oid: '.1.3.6.1.4.1.8691.7.108.1.10.11.1.7.{{ $index }}'
 | 
			
		||||
                    descr: '{{ $ifDescr }} SFP module Transmit Power'
 | 
			
		||||
                    index: 'fiberTxPower.{{ $index }}'
 | 
			
		||||
                    value: fiberTxPower
 | 
			
		||||
                    low_limit: -9.0
 | 
			
		||||
                    high_limit: -3.0
 | 
			
		||||
                -
 | 
			
		||||
                    oid: MOXA-EDSG512E8POE-MIB::fiberRxPower
 | 
			
		||||
                    num_oid: '.1.3.6.1.4.1.8691.7.108.1.10.11.1.9.{{ $index }}'
 | 
			
		||||
                    descr: '{{ $ifDescr }} SFP module Receive Power'
 | 
			
		||||
                    index: 'fiberRxPower.{{ $index }}'
 | 
			
		||||
                    value: fiberRxPower
 | 
			
		||||
                    low_limit: -21.0
 | 
			
		||||
                    high_limit: -3.0
 | 
			
		||||
        state:
 | 
			
		||||
            data:
 | 
			
		||||
                -
 | 
			
		||||
                    oid: power1InputStatus
 | 
			
		||||
                    oid: MOXA-EDSP510A8POE-MIB::power1InputStatus
 | 
			
		||||
                    num_oid: '.1.3.6.1.4.1.8691.7.86.1.10.1.{{ $index }}'
 | 
			
		||||
                    descr: 'Power Input 1 Status'
 | 
			
		||||
                    index: 'powerInputStatus.1'
 | 
			
		||||
@@ -68,7 +123,7 @@ modules:
 | 
			
		||||
                        - { value:  0, generic: 2, graph: 0, descr: not present }
 | 
			
		||||
                        - { value:  1, generic: 0, graph: 0, descr: present }
 | 
			
		||||
                -
 | 
			
		||||
                    oid: power2InputStatus
 | 
			
		||||
                    oid: MOXA-EDSP510A8POE-MIB::power2InputStatus
 | 
			
		||||
                    num_oid: '.1.3.6.1.4.1.8691.7.86.1.10.2.{{ $index }}'
 | 
			
		||||
                    descr: 'Power Input 2 Status'
 | 
			
		||||
                    index: 'powerInputStatus.2'
 | 
			
		||||
@@ -77,3 +132,23 @@ modules:
 | 
			
		||||
                    states:
 | 
			
		||||
                        - { value:  0, generic: 2, graph: 0, descr: not present }
 | 
			
		||||
                        - { value:  1, generic: 0, graph: 0, descr: present }
 | 
			
		||||
                -
 | 
			
		||||
                    oid: MOXA-EDSG512E8POE-MIB::power1InputStatus
 | 
			
		||||
                    num_oid: '.1.3.6.1.4.1.8691.7.108.1.10.1.{{ $index }}'
 | 
			
		||||
                    descr: 'Power Input 1 Status'
 | 
			
		||||
                    index: 'powerInputStatus.1'
 | 
			
		||||
                    value: power1InputStatus
 | 
			
		||||
                    state_name: powerInputStatus
 | 
			
		||||
                    states:
 | 
			
		||||
                        - { value:  0, generic: 2, graph: 0, descr: not present }
 | 
			
		||||
                        - { value:  1, generic: 0, graph: 0, descr: present }
 | 
			
		||||
                -
 | 
			
		||||
                    oid: MOXA-EDSG512E8POE-MIB::power2InputStatus
 | 
			
		||||
                    num_oid: '.1.3.6.1.4.1.8691.7.108.1.10.2.{{ $index }}'
 | 
			
		||||
                    descr: 'Power Input 2 Status'
 | 
			
		||||
                    index: 'powerInputStatus.2'
 | 
			
		||||
                    value: power2InputStatus
 | 
			
		||||
                    state_name: powerInputStatus
 | 
			
		||||
                    states:
 | 
			
		||||
                        - { value:  0, generic: 2, graph: 0, descr: not present }
 | 
			
		||||
                        - { value:  1, generic: 0, graph: 0, descr: present }
 | 
			
		||||
 
 | 
			
		||||
@@ -19,6 +19,10 @@ if ($device['os'] == 'moxa-etherdevice') {
 | 
			
		||||
        $mibmod = 'MOXA-IKS6726A-MIB';
 | 
			
		||||
    } elseif ($device['sysDescr'] == 'EDS-G508E-T') {
 | 
			
		||||
        $mibmod = 'MOXA-EDSG508E-MIB';
 | 
			
		||||
    } elseif ($device['sysDescr'] == 'EDS-P510A-8PoE-2GTXSFP-T') {
 | 
			
		||||
        $mibmod = 'MOXA-EDSP510A8POE-MIB';
 | 
			
		||||
    } elseif ($device['sysDescr'] == 'EDS-G512E-8PoE-T') {
 | 
			
		||||
        $mibmod = 'MOXA-EDSG512E8POE-MIB';
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    $mem_res = snmp_get_multi_oid($device, ['totalMemory.0', 'freeMemory.0'], '-OQUs', $mibmod);
 | 
			
		||||
 
 | 
			
		||||
@@ -25,6 +25,10 @@ if ($device['sysDescr'] == 'IKS-6726A-2GTXSFP-T') {
 | 
			
		||||
    $mibmod = 'MOXA-IKS6726A-MIB';
 | 
			
		||||
} elseif ($device['sysDescr'] == 'EDS-G508E-T') {
 | 
			
		||||
    $mibmod = 'MOXA-EDSG508E-MIB';
 | 
			
		||||
} elseif ($device['sysDescr'] == 'EDS-P510A-8PoE-2GTXSFP-T') {
 | 
			
		||||
    $mibmod = 'MOXA-EDSP510A8POE-MIB';
 | 
			
		||||
} elseif ($device['sysDescr'] == 'EDS-G512E-8PoE-T') {
 | 
			
		||||
    $mibmod = 'MOXA-EDSG512E8POE-MIB';
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
$mem_res = snmp_get_multi_oid($device, ['totalMemory.0', 'usedMemory.0', 'freeMemory.0'], '-OQUs', $mibmod);
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ $oids = array(
 | 
			
		||||
    'version' => $device['sysObjectID'].'.1.4.0',
 | 
			
		||||
    'serial' => $device['sysObjectID'].'.1.78.0',
 | 
			
		||||
);
 | 
			
		||||
  
 | 
			
		||||
 | 
			
		||||
$os_data = snmp_get_multi_oid($device, $oids);
 | 
			
		||||
 | 
			
		||||
foreach ($oids as $var => $oid) {
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										6634
									
								
								mibs/moxa/MOXA-EDSG512E8POE-MIB
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6634
									
								
								mibs/moxa/MOXA-EDSG512E8POE-MIB
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										1900
									
								
								tests/data/moxa-etherdevice_edsg512epoe.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1900
									
								
								tests/data/moxa-etherdevice_edsg512epoe.json
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										36
									
								
								tests/snmpsim/moxa-etherdevice_edsg512epoe.snmprec
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										36
									
								
								tests/snmpsim/moxa-etherdevice_edsg512epoe.snmprec
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,36 @@
 | 
			
		||||
1.3.6.1.2.1.1.1.0|4|EDS-G512E-8PoE-T
 | 
			
		||||
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.8691.7.108
 | 
			
		||||
1.3.6.1.2.1.1.3.0|67|876492922
 | 
			
		||||
1.3.6.1.2.1.1.4.0|4|<private>
 | 
			
		||||
1.3.6.1.2.1.1.5.0|4|<private>
 | 
			
		||||
1.3.6.1.2.1.1.6.0|4|<private>
 | 
			
		||||
1.3.6.1.2.1.2.2.1.2.1|4|Ethernet Port G1
 | 
			
		||||
1.3.6.1.2.1.2.2.1.2.2|4|Ethernet Port G2
 | 
			
		||||
1.3.6.1.2.1.2.2.1.2.3|4|Ethernet Port G3
 | 
			
		||||
1.3.6.1.2.1.2.2.1.2.4|4|Ethernet Port G4
 | 
			
		||||
1.3.6.1.2.1.2.2.1.2.5|4|Ethernet Port G5
 | 
			
		||||
1.3.6.1.2.1.2.2.1.2.6|4|Ethernet Port G6
 | 
			
		||||
1.3.6.1.2.1.2.2.1.2.7|4|Ethernet Port G7
 | 
			
		||||
1.3.6.1.2.1.2.2.1.2.8|4|Ethernet Port G8
 | 
			
		||||
1.3.6.1.2.1.2.2.1.2.9|4|Ethernet Port G9
 | 
			
		||||
1.3.6.1.2.1.2.2.1.2.10|4|Ethernet Port G10
 | 
			
		||||
1.3.6.1.2.1.2.2.1.2.11|4|Ethernet Port G11
 | 
			
		||||
1.3.6.1.2.1.2.2.1.2.12|4|Ethernet Port G12
 | 
			
		||||
1.3.6.1.2.1.2.2.1.2.129|4|Management Port of EtherDevice Server
 | 
			
		||||
1.3.6.1.2.1.2.2.1.2.130|4|(Management Loopback Port of EtherDevice Switch)
 | 
			
		||||
1.3.6.1.4.1.8691.7.108.1.10.1.0|2|1
 | 
			
		||||
1.3.6.1.4.1.8691.7.108.1.10.2.0|2|0
 | 
			
		||||
1.3.6.1.4.1.8691.7.108.1.10.8.0|4|6.13
 | 
			
		||||
1.3.6.1.4.1.8691.7.108.1.10.11.1.4.12|4|3.3
 | 
			
		||||
1.3.6.1.4.1.8691.7.108.1.10.11.1.5.12|4|33.8
 | 
			
		||||
1.3.6.1.4.1.8691.7.108.1.10.11.1.7.12|4|-5.7
 | 
			
		||||
1.3.6.1.4.1.8691.7.108.1.10.11.1.9.12|4|-7.4
 | 
			
		||||
1.3.6.1.4.1.8691.7.108.1.40.6.1.2.1|2|3
 | 
			
		||||
1.3.6.1.4.1.8691.7.108.1.40.6.1.2.2|2|-1
 | 
			
		||||
1.3.6.1.4.1.8691.7.108.1.40.6.1.2.3|2|-1
 | 
			
		||||
1.3.6.1.4.1.8691.7.108.1.40.6.1.2.4|2|3
 | 
			
		||||
1.3.6.1.4.1.8691.7.108.1.40.6.1.2.5|2|-1
 | 
			
		||||
1.3.6.1.4.1.8691.7.108.1.40.6.1.2.6|2|-1
 | 
			
		||||
1.3.6.1.4.1.8691.7.108.1.40.6.1.2.7|2|-1
 | 
			
		||||
1.3.6.1.4.1.8691.7.108.1.40.6.1.2.8|2|-1
 | 
			
		||||
1.3.6.1.6.3.10.2.1.3.0|2|174987
 | 
			
		||||
		Reference in New Issue
	
	Block a user