Merge pull request #2958 from murrant/calix

Calix Support
This commit is contained in:
Neil Lathwood
2016-02-09 20:06:27 +00:00
9 changed files with 2442 additions and 1 deletions
+10
View File
@@ -311,6 +311,16 @@ $config['os'][$os]['icon'] = 'barracuda';
$config['os'][$os]['over'][0]['graph'] = 'device_bits';
$config['os'][$os]['over'][0]['text'] = 'Traffic';
// Calix
$os = 'calix';
$config['os'][$os]['text'] = 'Calix E7';
$config['os'][$os]['type'] = 'network';
$config['os'][$os]['ifname'] = 1;
$config['os'][$os]['empty_ifdescr'] = 1;
$config['os'][$os]['icon'] = 'calix';
$config['os'][$os]['over'][0]['graph'] = 'device_bits';
$config['os'][$os]['over'][0]['text'] = 'Device Traffic';
// Cisco OSes
$os = 'ios';
$config['os'][$os]['group'] = 'cisco';
+6
View File
@@ -0,0 +1,6 @@
<?php
if (!$os) {
if (strstr($sysObjectId, '.6321.1.2.2.5.3')) {
$os = 'calix';
}
}
+1 -1
View File
@@ -895,7 +895,7 @@ function is_port_valid($port, $device) {
}
}
}
if (empty($port['ifDescr'])) {
if (empty($port['ifDescr']) && !$config['os'][$device['os']]['empty_ifdescr']) {
$valid = 0;
}
if ($device['os'] == "catos" && strstr($if, "vlan")) {
+6
View File
@@ -0,0 +1,6 @@
<?php
// Device might not have a card 1 (or even card2 if it is an E7-20)
$version = strtok(snmp_walk($device, "e7CardSoftwareVersion.1", "-OQv", "E7-Calix-MIB"), PHP_EOL);
$hardware = "Calix " . $poll_device['sysDescr'];
$features = str_replace(PHP_EOL, ', ', snmp_walk($device, "e7CardProvType", "-OQv", "E7-Calix-MIB"));
$serial = str_replace(PHP_EOL, ', ', snmp_walk($device, "e7CardSerialNumber", "-OQv", "E7-Calix-MIB"));