6 Commits

Author SHA1 Message Date
Tony Murray
edbb6ae0e3 refactor: Centralize MIB include directory specification (#4603)
* refactor: Centralize MIB include directory specification
The default is now:
```
$config['mib_dir'].'/mibdirname:'.$config['mib_dir']
```
This means we exclude OS mibs and only use ours  (we could prepend `+` if we want to include os mibs.
All snmp calls should only include the name of the subdirectory under the mibs directory.

* Remove d_echo from Proc
Fix snmpsim tests.
2016-09-28 14:19:28 +01:00
Tony Murray
9284bc60ff Update code in includes to be PSR-2 compliant (#4220)
refactor: Update code in /includes to be psr2 compliant #4220
2016-08-28 18:32:58 +01:00
thecityofguanyu
88ed9feed7 Per laf's request, modified changes to consolidate Calix E5 support into the 'calix' OS group rather than creating a new one.
Changes to be committed:
	modified:   includes/definitions.inc.php
	modified:   includes/discovery/os/calix.inc.php
	renamed:    includes/discovery/sensors/temperatures/calix-e5.inc.php -> includes/discovery/sensors/temperatures/calix.inc.php
	modified:   includes/polling/os/calix.inc.php
	renamed:    mibs/calix-e5/E5-110-AESCOMMON-MIB.mib -> mibs/calix/E5-110-AESCOMMON-MIB.mib
	renamed:    mibs/calix-e5/E5-110-AS-ATM-MIB.mib -> mibs/calix/E5-110-AS-ATM-MIB.mib
	renamed:    mibs/calix-e5/E5-110-IESCOMMON-MIB.mib -> mibs/calix/E5-110-IESCOMMON-MIB.mib
	renamed:    mibs/calix-e5/E5-110-MIB.mib -> mibs/calix/E5-110-MIB.mib
	renamed:    mibs/calix-e5/E5-110-TRAPS-MIB.mib -> mibs/calix/E5-110-TRAPS-MIB.mib
	renamed:    mibs/calix-e5/E5-111 alarm.xls -> mibs/calix/E5-111 alarm.xls
	renamed:    mibs/calix-e5/E5-111-AESCOMMON-MIB.mib -> mibs/calix/E5-111-AESCOMMON-MIB.mib
	renamed:    mibs/calix-e5/E5-111-AS-ATM-MIB.mib -> mibs/calix/E5-111-AS-ATM-MIB.mib
	renamed:    mibs/calix-e5/E5-111-IESCOMMON-MIB.mib -> mibs/calix/E5-111-IESCOMMON-MIB.mib
	renamed:    mibs/calix-e5/E5-111-MIB.mib -> mibs/calix/E5-111-MIB.mib
	renamed:    mibs/calix-e5/E5-111-TRAPS-MIB.mib -> mibs/calix/E5-111-TRAPS-MIB.mib
	renamed:    mibs/calix-e5/E5-120-AS-ATM-MIB.mib -> mibs/calix/E5-120-AS-ATM-MIB.mib
	renamed:    mibs/calix-e5/E5-120-IESCOMMON-MIB.mib -> mibs/calix/E5-120-IESCOMMON-MIB.mib
	renamed:    mibs/calix-e5/E5-120-MIB.mib -> mibs/calix/E5-120-MIB.mib
	renamed:    mibs/calix-e5/E5-120-TRAPS-MIB.mib -> mibs/calix/E5-120-TRAPS-MIB.mib
	renamed:    mibs/calix-e5/E5-121-AS-ATM-MIB.mib -> mibs/calix/E5-121-AS-ATM-MIB.mib
	renamed:    mibs/calix-e5/E5-121-IESCOMMON-MIB.mib -> mibs/calix/E5-121-IESCOMMON-MIB.mib
	renamed:    mibs/calix-e5/E5-121-MIB.mib -> mibs/calix/E5-121-MIB.mib
	renamed:    mibs/calix-e5/E5-121-TRAPS-MIB.mib -> mibs/calix/E5-121-TRAPS-MIB.mib
	renamed:    mibs/calix-e5/HCNUM-TC[rfc2856].mib -> mibs/calix/HCNUM-TC[rfc2856].mib
	renamed:    mibs/calix-e5/MIB_ALARM_E5-110_implementation_table.xls -> mibs/calix/MIB_ALARM_E5-110_implementation_table.xls
	renamed:    mibs/calix-e5/MIB_ALARM_E5-111_implementation_table.xls -> mibs/calix/MIB_ALARM_E5-111_implementation_table.xls
	renamed:    mibs/calix-e5/MIB_ALARM_E5-121_implementation_table.xls -> mibs/calix/MIB_ALARM_E5-121_implementation_table.xls
	renamed:    mibs/calix-e5/RFC-3728.mib -> mibs/calix/RFC-3728.mib
	renamed:    mibs/calix-e5/RFC3705-MIB.mib -> mibs/calix/RFC3705-MIB.mib
2016-07-23 16:01:17 -05:00
Tony Murray
799bb4dc5d Pull card serial numbers. Unsure if this what we want.
Set ifName as the primary port name.
2016-02-08 10:29:55 -06:00
Tony Murray
6f31755dfb Use poll_device;
List the inserted cards in "features".
2016-02-05 18:14:44 -06:00
Tony Murray
4aa9838eda add discover, polling and mibs.
work around empty ifDesc
2016-02-05 14:26:06 -06:00