9 Commits

Author SHA1 Message Date
Tony Murray 8f4a041b8d Fix Calix OS definitions (#8832)
* Fix Calix OS definitions

The main change is EXA (E7, etc) and B6 (Occam) devices are now their own OS

Now the follow OS exist:
exa: E7 EXA, E5-400, E5-48, E3-48, E3-8G
occamos: B6

Unchanged:
calix: E5-1**, E3-12C
axos: E7-2 AXOS, E9-2, E3-2, E5-520, E5-16F, E3-16F, E5-30x

* fix tests
exa_e7-2 seems like bogus data.

* additional tests, fix an error in the yaml

* Remove extra line return

* Add missed file
2018-07-23 12:44:53 -05:00
Neil Lathwood 42e5819130 refactor: Updated discovery/poller to use numeric sysObjectID (#7922)
* refactor: Updated discovery to use a core module for sysDescr/sysObjectID use

* final update hopefully

* revert changes

* more changes + docs

* migrated poller to use numerical sysObjectID

* more updates for sysObjectID

* update any alert rules which might have enterprises. in

* moved schema file

* small updates

* updated getHostOS()

* scrut fixes

* updated sysObjectId -> sysObjectID

* updated sysObjectId -> sysObjectID

* updated remainder of sysObjectId -> sysObjectID

* another sysObjectId -> sysObjectID

* fixed secureplatform test data

* Fix tests: $device is not pulled from the database before polling
Also, update the db in the core discovery module.
2018-01-06 23:00:47 -06:00
Tony Murray d6db01abb5 refactor: Refactor fix php codesniffer 3.x issues (#7816)
We cannot use 3.x because it  requires php 5.4, so update to 2.9.1 or newer 2.x release.
2017-11-29 08:23:19 +00:00
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