mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into rrd-create-remote

Browse Source
This commit is contained in:
Tony Murray
2016-08-08 20:23:15 -05:00
parent ead28f6acd b93a060458
commit 68303a96da
23 changed files with 193 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
.travis.yml
View File

@@ -1,13 +1,19 @@
language: php
php:
- '5.3'
- '5.4'
- '5.5'
- '5.6'
- '7.0'
- hhvm
matrix:
fast_finish: true
include:
- php: 5.3
script: find . -path './lib/influxdb-php' -prune -o -name "*.php" -print0 | xargs -0 -n1 -P8 php -l | grep -v '^No syntax errors detected' ; test $? -eq 1
- php: 5.4
script: find . -path './lib/influxdb-php' -prune -o -name "*.php" -print0 | xargs -0 -n1 -P8 php -l | grep -v '^No syntax errors detected' ; test $? -eq 1
- php: 5.5
script: find . -name "*.php" -print0 | xargs -0 -n1 -P8 php -l | grep -v '^No syntax errors detected' ; test $? -eq 1
- php: 5.6
script: find . -name "*.php" -print0 | xargs -0 -n1 -P8 php -l | grep -v '^No syntax errors detected' ; test $? -eq 1
- php: 7.0
script: find . -name "*.php" -print0 | xargs -0 -n1 -P8 php -l | grep -v '^No syntax errors detected' ; test $? -eq 1
- php: hhvm
script: find . -path './lib/influxdb-php' -prune -o -name "*.php" -print0 | xargs -0 -n1 -P8 php -l | grep -v '^No syntax errors detected' ; test $? -eq 1
allow_failures:
- php: 7.0
- php: 7.0
- php: hhvm

2
README.md
View File

@@ -1,3 +1,5 @@
[![Build Status](https://scrutinizer-ci.com/g/librenms/librenms/badges/build.png?b=master)](https://scrutinizer-ci.com/g/librenms/librenms/build-status/master) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/librenms/librenms/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/librenms/librenms/?branch=master) [![Build Status](https://travis-ci.org/librenms/librenms.svg?branch=master)](https://travis-ci.org/librenms/librenms)
Introduction
------------

30
addhost.php
View File

@@ -49,7 +49,7 @@ if (isset ($options['p'])) {
if (! in_array ($port_assoc_mode, $valid_assoc_modes)) {
echo "Invalid port association mode '" . $port_assoc_mode . "'\n";
echo 'Valid modes: ' . join (', ', $valid_assoc_modes) . "\n";
exit(2);
exit(1);
}
$cmd = array_shift($argv);
@@ -115,7 +115,7 @@ if (!empty($argv[1])) {
$v3['authalgo'] = $arg;
} else {
echo 'Invalid argument: '.$arg."\n";
exit(2);
exit(1);
}
}
@@ -139,7 +139,7 @@ if (!empty($argv[1])) {
$v3['cryptoalgo'] = $arg;
} else {
echo 'Invalid argument: '.$arg."\n";
exit(2);
exit(1);
}
}//end while
@@ -165,16 +165,20 @@ if (!empty($argv[1])) {
}
}//end if
$result = addHost($host, $snmpver, $port, $transport, 0, $poller_group, $force_add, $port_assoc_mode);
if (is_numeric($result)) {
$device = device_by_id_cache($result);
echo 'Added device '.$device['hostname'].' ('.$result.")\n";
try {
$device_id = addHost($host, $snmpver, $port, $transport, $poller_group, $force_add, $port_assoc_mode);
$device = device_by_id_cache($device_id);
echo "Added device {$device['hostname']} ($device_id)\n";
exit(0);
}
else {
print $console_color->convert("%rWe couldn't add this device:\n " . $result . "%n\n");
exit(1);
} catch (HostUnreachableException $e) {
print_error($e->getMessage());
foreach ($e->getReasons() as $reason) {
echo " $reason\n";
}
exit(2);
} catch (Exception $e){
print_error($e->getMessage());
exit(3);
}
} else {
@@ -197,5 +201,5 @@ if (!empty($argv[1])) {
%rRemember to run discovery for the host afterwards.%n
'
);
exit(2);
exit(1);
}

2
doc/API/API-Docs.md
View File

@@ -629,7 +629,7 @@ Output:
```text
{
"status": "ok",
"message": "Device localhost.localdomain has been added successfully"
"message": "Device localhost.localdomain (57) has been added successfully"
}
```

11
html/includes/api_functions.inc.php
View File

@@ -289,14 +289,13 @@ function add_device() {
$message = "You haven't specified an SNMP version to use";
}
if (empty($message)) {
$result = addHost($hostname, $snmpver, $port, $transport, 1, $poller_group, $force_add);
if (is_numeric($result)) {
try {
$device_id = addHost($hostname, $snmpver, $port, $transport, $poller_group, $force_add);
$code = 201;
$status = 'ok';
$message = "Device $hostname has been added successfully";
}
else {
$message = $result;
$message = "Device $hostname ($device_id) has been added successfully";
} catch (Exception $e) {
$message = $e->getMessage();
}
}

0
html/includes/graphs/application/dhcp-stats.inc.php → html/includes/graphs/application/dhcp-stats_stats.inc.php
View File

0
html/includes/graphs/application/os-updates.inc.php → html/includes/graphs/application/os-updates_packages.inc.php
View File

2
html/includes/graphs/port/pagp_bits.inc.php
View File

@@ -3,7 +3,7 @@
// Generate a list of ports and then call the multi_bits grapher to generate from the list
$i = 0;
foreach (dbFetchRows('SELECT * FROM `ports` WHERE `device_id` = ? AND `pagpGroupIfIndex` = ?', array($port['device_id'], $port['ifIndex'])) as $int) {
$rrd_file = get_port_rrdfile_path ($hostname, int['port_id']);
$rrd_file = get_port_rrdfile_path ($hostname, $int['port_id']);
if (rrdtool_check_rrd_exists($rrd_file)) {
$rrd_list[$i]['filename'] = $rrd_file;
$rrd_list[$i]['descr'] = $int['ifDescr'];

15
html/pages/addhost.inc.php
View File

@@ -66,11 +66,16 @@ if ($_POST['hostname']) {
}
$port_assoc_mode = $_POST['port_assoc_mode'];
$result = addHost($hostname, $snmpver, $port, $transport, 0, $poller_group, $force_add, $port_assoc_mode);
if (is_numeric($result)) {
print_message("Device added ($result)");
} else {
print_error('Error: ' . $result);
try {
$device_id = addHost($hostname, $snmpver, $port, $transport, $poller_group, $force_add, $port_assoc_mode);
print_message("Device added ($device_id)");
} catch (HostUnreachableException $e) {
print_error($e->getMessage());
foreach ($e->getReasons() as $reason) {
print_error($reason);
}
} catch (Exception $e){
print_error($e->getMessage());
}
}
else {

8
html/pages/apps.inc.php
View File

@@ -76,8 +76,12 @@ $graphs['nfs-v3-stats'] = array(
'rpc',
);
$graphs['os-updates'] = array('');
$graphs['dhcp-stats'] = array('');
$graphs['os-updates'] = array(
'packages',
);
$graphs['dhcp-stats'] = array(
'stats',
);
print_optionbar_start();

2
html/pages/device/apps/dhcp-stats.inc.php
View File

@@ -3,7 +3,7 @@
global $config;
$graphs = array(
'dhcp-stats' => 'DHCP Stats',
'dhcp-stats_stats' => 'DHCP Stats',
);
foreach ($graphs as $key => $text) {

2
html/pages/device/apps/os-updates.inc.php
View File

@@ -3,7 +3,7 @@
global $config;
$graphs = array(
'os-updates' => 'OS updates',
'os-updates_packages' => 'OS updates',
);
foreach ($graphs as $key => $text) {

13
includes/discovery/functions.inc.php
View File

@@ -53,9 +53,8 @@ function discover_new_device($hostname, $device = '', $method = '', $interface =
}
if (match_network($config['nets'], $ip)) {
$result = addHost($dst_host, '', '161', 'udp', '0', $config['distributed_poller_group']);
if (is_numeric($result)) {
$remote_device_id = $result;
try {
$remote_device_id = addHost($dst_host, '', '161', 'udp', $config['distributed_poller_group']);
$remote_device = device_by_id_cache($remote_device_id, 1);
echo '+[' . $remote_device['hostname'] . '(' . $remote_device['device_id'] . ')]';
discover_device($remote_device);
@@ -73,10 +72,10 @@ function discover_new_device($hostname, $device = '', $method = '', $interface =
}
return $remote_device_id;
} else {
if(substr($result, 0, 12) !== 'Already have') {
log_event("$method discovery of " . $dst_host . " ($ip) failed - " . $result);
}
} catch (HostExistsException $e) {
// already have this device
} catch (Exception $e) {
log_event("$method discovery of " . $dst_host . " ($ip) failed - " . $e->getMessage());
}
} else {
d_echo("$ip not in a matched network - skipping\n");

4
includes/discovery/os/radlan.inc.php
View File

@@ -1,10 +1,6 @@
<?php
if (!$os) {
if (strstr($sysDescr, 'Neyland 24T')) {
$os = 'radlan';
} //end if
if (strstr($sysDescr, 'AT-8000')) {
$os = 'radlan';
} //end if

70
includes/exceptions.inc.php Normal file
View File

@@ -0,0 +1,70 @@
<?php
/**
* exceptions.inc.php
*
* Custom Exception definitions
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @package LibreNMS
* @link http://librenms.org
* @copyright 2016 Tony Murray
* @author Tony Murray <murraytony@gmail.com>
*/
// ---- addHost Excpetions ----
class HostExistsException extends Exception {}
class HostIpExistsException extends HostExistsException {}
class InvalidPortAssocModeException extends Exception {}
class SnmpVersionUnsupportedException extends Exception {}
class HostUnreachableException extends Exception
{
protected $reasons = array();
public function __toString()
{
$string = __CLASS__ . ": [{$this->code}]: {$this->message}\n";
foreach ($this->reasons as $reason) {
$string .= " $reason\n";
}
return $string;
}
/**
* Add additional reasons
* @param $message
*/
public function addReason($message)
{
$this->reasons[] = $message;
}
/**
* Get the reasons
* @return array
*/
public function getReasons()
{
return $this->reasons;
}
}
class HostUnreachablePingException extends HostUnreachableException {}
class HostUnreachableSnmpException extends HostUnreachableException {}

36
includes/functions.php
View File

@@ -17,7 +17,8 @@
include_once("Net/IPv4.php");
include_once("Net/IPv6.php");
// Observium Includes
// Includes
include_once($config['install_dir'] . "/includes/exceptions.inc.php");
include_once($config['install_dir'] . "/includes/dbFacile.php");
include_once($config['install_dir'] . "/includes/common.php");
@@ -251,23 +252,30 @@ function delete_device($id) {
* @param string $snmp_version If this is empty, try v2c,v3,v1. Otherwise, use this specific version.
* @param string $port the port to connect to for snmp
* @param string $transport udp or tcp
* @param int $quiet don't output anything
* @param string $poller_group the poller group this device will belong to
* @param string $force_add add even if the device isn't pingable
* @param string $port_assoc_mode snmp field to use to determine unique ports
* @return int|string returns the id of the added device, otherwise an error message
*
* @return int returns the device_id of the added device
*
* @throws HostExistsException This hostname already exists
* @throws HostIpExistsException We already have a host with this IP
* @throws HostUnreachableException We could not reach this device is some way
* @throws HostUnreachablePingException We could not ping the device
* @throws InvalidPortAssocModeException The given port association mode was invalid
* @throws SnmpVersionUnsupportedException The given snmp version was invalid
*/
function addHost($host, $snmp_version = '', $port = '161', $transport = 'udp', $quiet = 0, $poller_group = '0', $force_add = '0', $port_assoc_mode = 'ifIndex') {
function addHost($host, $snmp_version = '', $port = '161', $transport = 'udp', $poller_group = '0', $force_add = '0', $port_assoc_mode = 'ifIndex') {
global $config;
// Test Database Exists
if (host_exists($host) === true) {
return "Already have host $host";
throw new HostExistsException("Already have host $host");
}
// Valid port assoc mode
if (!is_valid_port_assoc_mode($port_assoc_mode)) {
return "Invalid port association_mode '$port_assoc_mode'. Valid modes are: " . join(', ', get_port_assoc_modes());
throw new InvalidPortAssocModeException("Invalid port association_mode '$port_assoc_mode'. Valid modes are: " . join(', ', get_port_assoc_modes()));
}
// check if we have the host by IP
@@ -277,14 +285,14 @@ function addHost($host, $snmp_version = '', $port = '161', $transport = 'udp', $
$ip = $host;
}
if (ip_exists($ip)) {
return "Already have host with this IP $host";
throw new HostIpExistsException("Already have host with this IP $host");
}
// Test reachability
$address_family = snmpTransportToAddressFamily($transport);
$ping_result = isPingable($host, $address_family);
if ($force_add == 1 || !$ping_result['result']) {
return "Could not ping $host";
throw new HostUnreachablePingException("Could not ping $host");
}
// if $snmpver isn't set, try each version of snmp
@@ -294,13 +302,13 @@ function addHost($host, $snmp_version = '', $port = '161', $transport = 'udp', $
$snmpvers = array($snmp_version);
}
$host_unreachable_exception = new HostUnreachableException("Could not connect, please check the snmp details and snmp reachability");
// try different snmp variables to add the device
foreach ($snmpvers as $snmpver) {
if ($snmpver === "v3") {
// Try each set of parameters from config
foreach ($config['snmp']['v3'] as $v3) {
$device = deviceArray($host, null, $snmpver, $port, $transport, $v3, $port_assoc_mode);
print_message("Trying v3 parameters " . $v3['authname'] . "/" . $v3['authlevel'] . " ... ", $quiet);
if ($force_add == 1 || isSNMPable($device)) {
$snmphost = snmp_get($device, "sysName.0", "-Oqv", "SNMPv2-MIB");
$result = createHost($host, null, $snmpver, $port, $transport, $v3, $poller_group, $port_assoc_mode, $snmphost);
@@ -308,14 +316,14 @@ function addHost($host, $snmp_version = '', $port = '161', $transport = 'udp', $
return $result;
}
} else {
print_error("No reply on credentials " . $v3['authname'] . "/" . $v3['authlevel'] . " using $snmpver", $quiet);
$host_unreachable_exception->addReason("SNMP $snmpver: No reply with credentials " . $v3['authname'] . "/" . $v3['authlevel']);
}
}
} elseif ($snmpver === "v2c" || $snmpver === "v1") {
// try each community from config
foreach ($config['snmp']['community'] as $community) {
$device = deviceArray($host, $community, $snmpver, $port, $transport, null, $port_assoc_mode);
print_message("Trying community $community ...", $quiet);
if ($force_add == 1 || isSNMPable($device)) {
$snmphost = snmp_get($device, "sysName.0", "-Oqv", "SNMPv2-MIB");
$result = createHost($host, $community, $snmpver, $port, $transport, array(), $poller_group, $port_assoc_mode, $snmphost);
@@ -323,15 +331,15 @@ function addHost($host, $snmp_version = '', $port = '161', $transport = 'udp', $
return $result;
}
} else {
print_error("No reply on community $community using $snmpver", $quiet);
$host_unreachable_exception->addReason("SNMP $snmpver: No reply with community $community");
}
}
} else {
return "Unsupported SNMP Version \"$snmpver\", must be v1, v2c, or v3";
throw new SnmpVersionUnsupportedException("Unsupported SNMP Version \"$snmpver\", must be v1, v2c, or v3");
}
}
return "Could not connect, please check the snmp details and snmp reachability";
throw $host_unreachable_exception;
}
function deviceArray($host, $community, $snmpver, $port = 161, $transport = 'udp', $v3, $port_assoc_mode = 'ifIndex') {

2
includes/polling/applications/proxmox.inc.php
View File

@@ -53,7 +53,7 @@ if (!is_dir($pmxcdir)) {
dbUpdate(array('device_id' => $device['device_id'], 'app_type' => $name, 'app_instance' => $pmxcluster), 'applications', '`device_id` = ? AND `app_type` = ?', array($device['device_id'], $name));
if (count($pmxlines) > 0) {
$pmxcache = [];
$pmxcache = array();
foreach ($pmxlines as $vm) {
list($vmid, $vmport, $vmpin, $vmpout, $vmdesc) = explode('/', $vm, 5);

3
includes/polling/applications/rrdcached.inc.php
View File

@@ -55,7 +55,8 @@ if ($agent_data['app'][$name]) {
while ($max == -1 || $count < $max) {
$data .= fgets($sock, 128);
if ($max == -1) {
$max = explode(' ', $data)[0] + 1;
$tmp_max = explode(' ', $data);
$max = $tmp_max[0]+1;
}
$count++;
}

6
includes/polling/os/comware.inc.php
View File

@@ -8,5 +8,7 @@ echo 'Comware OS...';
$hardware = snmp_get($device, 'sysObjectID.0', '-Osqv', 'SNMPv2-MIB:HH3C-PRODUCT-ID-MIB');
preg_match('/Software Version (.+), Release ([a-zA-Z0-9]+)/', $poll_device['sysDescr'], $match);
list(,$version,$features) = $match;
$data = str_replace(",","",$poll_device['sysDescr']);
$explodeddata = explode(" ", $data);
$version = $explodeddata['6'];
$features = $explodeddata['8'];

4
includes/polling/os/infinity.inc.php
View File

@@ -10,6 +10,6 @@
* the source code distribution for details.
*/
$version = $poll_device['sysDescr'];
$version = explode(' ', $version)[2];
$version = explode(' ', $poll_device['sysDescr']);
$version = $version[2];
$hardware = snmp_get($device, 'IEEE802dot11-MIB::dot11manufacturerProductName.5', '-Ovq');

14
includes/polling/os/radlan.inc.php
View File

@@ -1,16 +1,8 @@
<?php
if ($poll_device['sysDescr'] == 'Neyland 24T') {
// $hardware = snmp_get($device, "productIdentificationVendor.0", "-Ovq", "Dell-Vendor-MIB");
$hardware = 'Dell '.snmp_get($device, 'productIdentificationDisplayName.0', '-Ovq', 'Dell-Vendor-MIB');
$version = snmp_get($device, 'productIdentificationVersion.0', '-Ovq', 'Dell-Vendor-MIB');
$icon = 'dell';
}
else {
$version = snmp_get($device, 'rndBrgVersion.0', '-Ovq', 'RADLAN-MIB');
$hardware = str_replace('ATI', 'Allied Telesis', $poll_device['sysDescr']);
$icon = 'allied';
}
$version = snmp_get($device, 'rndBrgVersion.0', '-Ovq', 'RADLAN-MIB');
$hardware = str_replace('ATI', 'Allied Telesis', $poll_device['sysDescr']);
$icon = 'allied';
$features = snmp_get($device, 'rndBaseBootVersion.00', '-Ovq', 'RADLAN-MIB');

7
includes/syslog.php
View File

@@ -13,7 +13,12 @@ function get_cache($host, $value) {
case 'device_id':
// Try by hostname
$ip = inet_pton($host);
$dev_cache[$host]['device_id'] = dbFetchCell('SELECT `device_id` FROM devices WHERE `hostname` = ? OR `sysName` = ? OR `ip` = ?', array($host, $host, $ip));
if (inet_ntop($ip) === false) {
$dev_cache[$host]['device_id'] = dbFetchCell('SELECT `device_id` FROM devices WHERE `hostname` = ? OR `sysName` = ?', array($host, $host));
}
else {
$dev_cache[$host]['device_id'] = dbFetchCell('SELECT `device_id` FROM devices WHERE `hostname` = ? OR `sysName` = ? OR `ip` = ?', array($host, $host, $ip));
}
// If failed, try by IP
if (!is_numeric($dev_cache[$host]['device_id'])) {
$dev_cache[$host]['device_id'] = dbFetchCell('SELECT `device_id` FROM `ipv4_addresses` AS A, `ports` AS I WHERE A.ipv4_address = ? AND I.port_id = A.port_id', array($host));

27
snmp-scan.php
View File

@@ -42,7 +42,7 @@ require 'includes/functions.php';
require 'includes/discovery/functions.inc.php';
function perform_snmp_scan($net) {
global $stats, $config, $quiet;
global $stats, $config, $debug;
echo 'Range: '.$net->network.'/'.$net->bitmask.PHP_EOL;
$config['snmp']['timeout'] = 1;
$config['snmp']['retries'] = 0;
@@ -63,22 +63,30 @@ function perform_snmp_scan($net) {
continue;
}
foreach (array('udp','tcp') as $transport) {
$result = addHost(gethostbyaddr($host), '', $config['snmp']['port'], $transport, $quiet, $config['distributed_poller_group'], 0);
if (is_numeric($result)) {
try {
addHost(gethostbyaddr($host), '', $config['snmp']['port'], $transport, $config['distributed_poller_group']);
$stats['added']++;
echo '+';
break;
} elseif (substr($result, 0, 12) === 'Already have') {
} catch (HostExistsException $e) {
$stats['known']++;
echo '*';
break;
} elseif (substr($result, 0 , 14) === 'Could not ping') {
} catch (HostUnreachablePingException $e) {
echo '.';
break;
} elseif ($transport == 'tcp') {
// tried both udp and tcp without success
$stats['failed']++;
echo '-';
} catch (HostUnreachableException $e) {
if ($debug) {
print_error($e->getMessage() . " over $transport");
foreach ($e->getReasons() as $reason) {
echo " $reason\n";
}
}
if ($transport == 'tcp') {
// tried both udp and tcp without success
$stats['failed']++;
echo '-';
}
}
}
}
@@ -104,7 +112,6 @@ if (isset($opts['h']) || (empty($opts) && (!isset($config['nets']) || empty($con
}
if (isset($opts['d'])) {
$debug = true;
$quiet = 0;
}
if (isset($opts['l'])) {
echo ' * = Known Device; . = Unpingable Device; + = Added Device; - = Failed To Add Device;'.PHP_EOL;