thecityofguanyu/add-calix-e5-support #3864

Merged
merged 8 commits into from Aug 11, 2016

Projects

None yet

4 participants

@thecityofguanyu
Contributor

On branch thecityofguanyu/add-calix-e5-support

Changes to be committed:
modified: includes/definitions.inc.php
modified: includes/discovery/os/calix.inc.php
new file: includes/discovery/sensors/temperatures/calix-e5.inc.php
new file: includes/polling/os/calix-e5.inc.php
new file(s): mibs/a bunch of mibs

Chris A. Evans Committer: Chris A. Evans <caevans@zhangliao.bixbytelephone.com>
 On branch thecityofguanyu/add-calix-e5-support
 Changes to be committed:
	modified:   includes/definitions.inc.php
	modified:   includes/discovery/os/calix.inc.php
	new file:   includes/discovery/sensors/temperatures/calix-e5.inc.php
	new file:   includes/polling/os/calix-e5.inc.php
	new file:   mibs/calix-e5/ADSL-LINE-EXT-MIB.mib
	new file:   mibs/calix-e5/ADSL-LINE-MIB.mib
	new file:   mibs/calix-e5/ADSL-TC-MIB.mib
	new file:   mibs/calix-e5/BRIDGE-MIB.mib
	new file:   mibs/calix-e5/E5-110-AESCOMMON-MIB.mib
	new file:   mibs/calix-e5/E5-110-AS-ATM-MIB.mib
	new file:   mibs/calix-e5/E5-110-IESCOMMON-MIB.mib
	new file:   mibs/calix-e5/E5-110-MIB.mib
	new file:   mibs/calix-e5/E5-110-TRAPS-MIB.mib
	new file:   mibs/calix-e5/E5-111 alarm.xls
	new file:   mibs/calix-e5/E5-111-AESCOMMON-MIB.mib
	new file:   mibs/calix-e5/E5-111-AS-ATM-MIB.mib
	new file:   mibs/calix-e5/E5-111-IESCOMMON-MIB.mib
	new file:   mibs/calix-e5/E5-111-MIB.mib
	new file:   mibs/calix-e5/E5-111-TRAPS-MIB.mib
	new file:   mibs/calix-e5/E5-120-AS-ATM-MIB.mib
	new file:   mibs/calix-e5/E5-120-IESCOMMON-MIB.mib
	new file:   mibs/calix-e5/E5-120-MIB.mib
	new file:   mibs/calix-e5/E5-120-TRAPS-MIB.mib
	new file:   mibs/calix-e5/E5-121-AS-ATM-MIB.mib
	new file:   mibs/calix-e5/E5-121-IESCOMMON-MIB.mib
	new file:   mibs/calix-e5/E5-121-MIB.mib
	new file:   mibs/calix-e5/E5-121-TRAPS-MIB.mib
	new file:   mibs/calix-e5/HCNUM-TC[rfc2856].mib
	new file:   mibs/calix-e5/IANA-ADDRESS-FAMILY-NUMBERS-MIB.mib
	new file:   mibs/calix-e5/IANAifType-MIB.mib
	new file:   mibs/calix-e5/IEEE8021-CFMD8-MIB.mib
	new file:   mibs/calix-e5/IF-MIB.mib
	new file:   mibs/calix-e5/LLDP-MIB.mib
	new file:   mibs/calix-e5/MIB_ALARM_E5-110_implementation_table.xls
	new file:   mibs/calix-e5/MIB_ALARM_E5-111_implementation_table.xls
	new file:   mibs/calix-e5/MIB_ALARM_E5-121_implementation_table.xls
	new file:   mibs/calix-e5/P-BRIDGE-MIB.mib
	new file:   mibs/calix-e5/PerfHist-TC-MIB.mib
	new file:   mibs/calix-e5/Q-BRIDGE-MIB.mib
	new file:   mibs/calix-e5/RFC-1212.mib
	new file:   mibs/calix-e5/RFC-1215.mib
	new file:   mibs/calix-e5/RFC-3728.mib
	new file:   mibs/calix-e5/RFC1155-SMI.mib
	new file:   mibs/calix-e5/RFC1213-MIB.mib
	new file:   mibs/calix-e5/RFC3705-MIB.mib
	new file:   mibs/calix-e5/RMON-MIB.mib
	new file:   mibs/calix-e5/RMON2-MIB.mib
	new file:   mibs/calix-e5/SNMP-FRAMEWORK-MIB.mib
	new file:   mibs/calix-e5/SNMPv2-CONF.mib
	new file:   mibs/calix-e5/SNMPv2-MIB.mib
	new file:   mibs/calix-e5/SNMPv2-SMI.mib
	new file:   mibs/calix-e5/SNMPv2-TC.mib
	new file:   mibs/calix-e5/TOKEN-RING-RMON-MIB.mib
75f95ca
@Rosiak
Contributor
Rosiak commented Jul 21, 2016

A lot of the MIBS included already exist in the mibs dir, hence being redundant.

Chris A. Evans Deleted various redundant MIBs
8d09c3e
@thecityofguanyu
Contributor

@Rosiak

Deleted all of the MIBs that appeared to be redundant in 8d09c3e.

@laf
Member
laf commented Jul 23, 2016

Thanks, I don't see the point in creating a new OS definition for this.

Just deal with the differences in the calix.inc.php files.

@thecityofguanyu thecityofguanyu Per laf's request, modified changes to consolidate Calix E5 support i…
…nto 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
88ed9fe
@thecityofguanyu thecityofguanyu Merge remote-tracking branch 'origin/master' into thecityofguanyu/add…
…-calix-e5-support
f54845f
@thecityofguanyu
Contributor

@laf

Consolidated the E5 support into the pre-existing 'calix' OS definition.

@laf
Member
laf commented Jul 26, 2016

You still have includes/polling/os/calix-e5.inc.php in this

@laf
Member
laf commented Aug 4, 2016
Chris A. Evans added some commits Aug 8, 2016
Chris A. Evans erge branch 'master' into thecityofguanyu/add-calix-e5-support
70e1d19
Chris A. Evans removed includes/polling/os/calix-e5.inc.php
4f5d8fa
@thecityofguanyu
Contributor

@laf

Removed includes/polling/os/calix-e5.inc.php in latest commit

@laf
Member
laf commented Aug 8, 2016

Didn't notice this the first time round but you've got 4 .xls files in here, can you remove them pls.

Whilst you're at it you may as well remove .mib from the end of the file extensions.

Chris A. Evans added some commits Aug 11, 2016
Chris A. Evans Merge branch 'master' into thecityofguanyu/add-calix-e5-support d97987a
Chris A. Evans Changes to be committed:
	renamed:    E5-110-AESCOMMON-MIB.mib -> E5-110-AESCOMMON-MIB
	renamed:    E5-110-AS-ATM-MIB.mib -> E5-110-AS-ATM-MIB
	renamed:    E5-110-IESCOMMON-MIB.mib -> E5-110-IESCOMMON-MIB
	renamed:    E5-110-MIB.mib -> E5-110-MIB
	renamed:    E5-110-TRAPS-MIB.mib -> E5-110-TRAPS-MIB
	deleted:    E5-111 alarm.xls
	renamed:    E5-111-AESCOMMON-MIB.mib -> E5-111-AESCOMMON-MIB
	renamed:    E5-111-AS-ATM-MIB.mib -> E5-111-AS-ATM-MIB
	renamed:    E5-111-IESCOMMON-MIB.mib -> E5-111-IESCOMMON-MIB
	renamed:    E5-111-MIB.mib -> E5-111-MIB
	renamed:    E5-111-TRAPS-MIB.mib -> E5-111-TRAPS-MIB
	renamed:    E5-120-AS-ATM-MIB.mib -> E5-120-AS-ATM-MIB
	renamed:    E5-120-IESCOMMON-MIB.mib -> E5-120-IESCOMMON-MIB
	renamed:    E5-120-MIB.mib -> E5-120-MIB
	renamed:    E5-120-TRAPS-MIB.mib -> E5-120-TRAPS-MIB
	renamed:    E5-121-AS-ATM-MIB.mib -> E5-121-AS-ATM-MIB
	renamed:    E5-121-IESCOMMON-MIB.mib -> E5-121-IESCOMMON-MIB
	renamed:    E5-121-MIB.mib -> E5-121-MIB
	renamed:    E5-121-TRAPS-MIB.mib -> E5-121-TRAPS-MIB
	renamed:    HCNUM-TC[rfc2856].mib -> HCNUM-TC[rfc2856]
	deleted:    MIB_ALARM_E5-110_implementation_table.xls
	deleted:    MIB_ALARM_E5-111_implementation_table.xls
	deleted:    MIB_ALARM_E5-121_implementation_table.xls
:	renamed:    RFC-3728.mib -> RFC-3728
	renamed:    RFC3705-MIB.mib -> RFC3705-MIB
9d4895d
@thecityofguanyu
Contributor

@laf

Didn't notice this the first time round but you've got 4 .xls files in here, can you remove them pls.

Whilst you're at it you may as well remove .mib from the end of the file extensions.

This is done.

@laf laf removed the Blocker label Aug 11, 2016
@laf laf merged commit a7a151e into librenms:master Aug 11, 2016

2 checks passed

Auto-Deploy Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment