Merge remote-tracking branch 'upstream/master' into exceptions

2024-10-07 16:52:45 +00:00 · 2016-08-08 15:43:47 -05:00
parent 1482e6e0a9 409e756ca2
commit 322b79f717
15 changed files with 45 additions and 37 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
--- a/README.md
+++ b/README.md
@@ -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
 ------------

--- a/html/includes/graphs/application/dhcp-stats_stats.inc.php
+++ b/html/includes/graphs/application/dhcp-stats_stats.inc.php
--- a/html/includes/graphs/application/os-updates_packages.inc.php
+++ b/html/includes/graphs/application/os-updates_packages.inc.php
--- a/html/includes/graphs/port/pagp_bits.inc.php
+++ b/html/includes/graphs/port/pagp_bits.inc.php
@@ -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 (is_file($rrd_file)) {
        $rrd_list[$i]['filename'] = $rrd_file;
        $rrd_list[$i]['descr']    = $int['ifDescr'];
--- a/html/pages/apps.inc.php
+++ b/html/pages/apps.inc.php
@@ -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();

--- a/html/pages/device/apps/dhcp-stats.inc.php
+++ b/html/pages/device/apps/dhcp-stats.inc.php
@@ -3,7 +3,7 @@
 global $config;

 $graphs = array(
-    'dhcp-stats' => 'DHCP Stats',
+    'dhcp-stats_stats' => 'DHCP Stats',
 );

 foreach ($graphs as $key => $text) {
--- a/html/pages/device/apps/os-updates.inc.php
+++ b/html/pages/device/apps/os-updates.inc.php
@@ -3,7 +3,7 @@
 global $config;

 $graphs = array(
-    'os-updates' => 'OS updates',
+    'os-updates_packages' => 'OS updates',
 );

 foreach ($graphs as $key => $text) {
--- a/includes/discovery/os/radlan.inc.php
+++ b/includes/discovery/os/radlan.inc.php
@@ -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
--- a/includes/polling/applications/proxmox.inc.php
+++ b/includes/polling/applications/proxmox.inc.php
@@ -51,7 +51,7 @@ if (!is_dir($pmxcdir)) {
 dbUpdate(array('device_id' => $device['device_id'], 'app_type' => 'proxmox', 'app_instance' => $pmxcluster), 'applications', '`device_id` = ? AND `app_type` = ?', array($device['device_id'], 'proxmox'));

 if (count($pmxlines) > 0) {
-    $pmxcache = [];
+    $pmxcache = array();

    foreach ($pmxlines as $vm) {
        list($vmid, $vmport, $vmpin, $vmpout, $vmdesc) = explode('/', $vm, 5);
--- a/includes/polling/applications/rrdcached.inc.php
+++ b/includes/polling/applications/rrdcached.inc.php
@@ -53,7 +53,8 @@ if ($agent_data['app']['rrdcached']) {
        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++;
        }
--- a/includes/polling/os/comware.inc.php
+++ b/includes/polling/os/comware.inc.php
@@ -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'];
--- a/includes/polling/os/infinity.inc.php
+++ b/includes/polling/os/infinity.inc.php
@@ -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');
--- a/includes/polling/os/radlan.inc.php
+++ b/includes/polling/os/radlan.inc.php
@@ -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');

--- a/includes/syslog.php
+++ b/includes/syslog.php
@@ -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));