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

Apply fixes from StyleCI (#12117)

Browse Source 
* Apply fixes from StyleCI

* Disable style check
This commit is contained in:
Jellyfrog
2020-09-21 14:54:51 +02:00
committed by GitHub
parent 8ec9183df5
commit 77c531527c
752 changed files with 6238 additions and 5833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
poll-billing.php
View File

@@ -13,7 +13,7 @@
use LibreNMS\Data\Store\Datastore;
$init_modules = array();
$init_modules = [];
require __DIR__ . '/includes/init.php';
if (isset($argv[1]) && is_numeric($argv[1])) {
@@ -42,10 +42,10 @@ if (isset($options['b'])) {
}
foreach ($query->get(['bill_id', 'bill_name']) as $bill) {
echo 'Bill : '.$bill->bill_name."\n";
echo 'Bill : ' . $bill->bill_name . "\n";
$bill_id = $bill->bill_id;
$port_list = dbFetchRows('SELECT * FROM `bill_ports` as P, `ports` as I, `devices` as D WHERE P.bill_id=? AND I.port_id = P.port_id AND D.device_id = I.device_id', array($bill_id));
$port_list = dbFetchRows('SELECT * FROM `bill_ports` as P, `ports` as I, `devices` as D WHERE P.bill_id=? AND I.port_id = P.port_id AND D.device_id = I.device_id', [$bill_id]);
$now = dbFetchCell('SELECT NOW()');
$delta = 0;
@@ -53,24 +53,24 @@ foreach ($query->get(['bill_id', 'bill_name']) as $bill) {
$out_delta = 0;
foreach ($port_list as $port_data) {
$port_id = $port_data['port_id'];
$host = $port_data['hostname'];
$port = $port_data['port'];
$host = $port_data['hostname'];
$port = $port_data['port'];
echo " Polling ${port_data['ifName']} (${port_data['ifDescr']}) on ${port_data['hostname']}\n";
$port_data['in_measurement'] = getValue($port_data['hostname'], $port_data['port'], $port_data['ifIndex'], 'In');
$port_data['in_measurement'] = getValue($port_data['hostname'], $port_data['port'], $port_data['ifIndex'], 'In');
$port_data['out_measurement'] = getValue($port_data['hostname'], $port_data['port'], $port_data['ifIndex'], 'Out');
$last_counters = getLastPortCounter($port_id, $bill_id);
if ($last_counters['state'] == 'ok') {
$port_data['last_in_measurement'] = $last_counters['in_counter'];
$port_data['last_in_delta'] = $last_counters['in_delta'];
$port_data['last_in_measurement'] = $last_counters['in_counter'];
$port_data['last_in_delta'] = $last_counters['in_delta'];
$port_data['last_out_measurement'] = $last_counters['out_counter'];
$port_data['last_out_delta'] = $last_counters['out_delta'];
$port_data['last_out_delta'] = $last_counters['out_delta'];
$tmp_period = dbFetchCell("SELECT UNIX_TIMESTAMP(CURRENT_TIMESTAMP()) - UNIX_TIMESTAMP('".mres($last_counters['timestamp'])."')");
$tmp_period = dbFetchCell("SELECT UNIX_TIMESTAMP(CURRENT_TIMESTAMP()) - UNIX_TIMESTAMP('" . mres($last_counters['timestamp']) . "')");
if ($port_data['ifSpeed'] > 0 && (delta_to_bits($port_data['in_measurement'], $tmp_period)-delta_to_bits($port_data['last_in_measurement'], $tmp_period)) > $port_data['ifSpeed']) {
if ($port_data['ifSpeed'] > 0 && (delta_to_bits($port_data['in_measurement'], $tmp_period) - delta_to_bits($port_data['last_in_measurement'], $tmp_period)) > $port_data['ifSpeed']) {
$port_data['in_delta'] = $port_data['last_in_delta'];
} elseif ($port_data['in_measurement'] >= $port_data['last_in_measurement']) {
$port_data['in_delta'] = ($port_data['in_measurement'] - $port_data['last_in_measurement']);
@@ -78,7 +78,7 @@ foreach ($query->get(['bill_id', 'bill_name']) as $bill) {
$port_data['in_delta'] = $port_data['last_in_delta'];
}
if ($port_data['ifSpeed'] > 0 && (delta_to_bits($port_data['out_measurement'], $tmp_period)-delta_to_bits($port_data['last_out_measurement'], $tmp_period)) > $port_data['ifSpeed']) {
if ($port_data['ifSpeed'] > 0 && (delta_to_bits($port_data['out_measurement'], $tmp_period) - delta_to_bits($port_data['last_out_measurement'], $tmp_period)) > $port_data['ifSpeed']) {
$port_data['out_delta'] = $port_data['last_out_delta'];
} elseif ($port_data['out_measurement'] >= $port_data['last_out_measurement']) {
$port_data['out_delta'] = ($port_data['out_measurement'] - $port_data['last_out_measurement']);
@@ -92,17 +92,17 @@ foreach ($query->get(['bill_id', 'bill_name']) as $bill) {
//////////////////////////////////CountersValidation$DB-Update
echo "\nDB SNMP counters received.\n";
echo " in_measurement: ",$port_data['in_measurement']," out_measurement: ",$port_data['out_measurement'],"\n";
echo " The data types are --> in_measurement:".gettype($port_data['in_measurement'])." and out_measurement: ".gettype($port_data['out_measurement'])."\n";
echo " The data types are --> in_measurement:" . gettype($port_data['in_measurement']) . " and out_measurement: " . gettype($port_data['out_measurement']) . "\n";
//For debugging
logfile("\n****$now: ".$bill->bill_name."\nDB SNMP counters received.");
logfile("in_measurement: ".$port_data['in_measurement']." out_measurement: ".$port_data['out_measurement']."\nThe data types are. in_measurement:".gettype($port_data['in_measurement'])." and out_measurement: ".gettype($port_data['out_measurement']));
logfile("IN_delta: ".$port_data['in_delta']." OUT_delta: ".$port_data['out_delta']."\nLast_IN_delta: ".$port_data['last_in_delta']." last_OUT_delta: ".$port_data['last_out_delta']);
logfile("\n****$now: " . $bill->bill_name . "\nDB SNMP counters received.");
logfile("in_measurement: " . $port_data['in_measurement'] . " out_measurement: " . $port_data['out_measurement'] . "\nThe data types are. in_measurement:" . gettype($port_data['in_measurement']) . " and out_measurement: " . gettype($port_data['out_measurement']));
logfile("IN_delta: " . $port_data['in_delta'] . " OUT_delta: " . $port_data['out_delta'] . "\nLast_IN_delta: " . $port_data['last_in_delta'] . " last_OUT_delta: " . $port_data['last_out_delta']);
if (is_numeric($port_data['in_measurement']) && is_numeric($port_data['out_measurement'])) {
echo "Nice, valid counters 'in/out_measurement', lets use them\n";
logfile("Nice, valid counters 'in/out_measurement', lets use them");
// NOTE: casting to string for mysqli bug (fixed by mysqlnd)
$fields = array('timestamp' => $now, 'in_counter' => (string)set_numeric($port_data['in_measurement']), 'out_counter' => (string)set_numeric($port_data['out_measurement']), 'in_delta' => (string)set_numeric($port_data['in_delta']), 'out_delta' => (string)set_numeric($port_data['out_delta']));
$fields = ['timestamp' => $now, 'in_counter' => (string) set_numeric($port_data['in_measurement']), 'out_counter' => (string) set_numeric($port_data['out_measurement']), 'in_delta' => (string) set_numeric($port_data['in_delta']), 'out_delta' => (string) set_numeric($port_data['out_delta'])];
if (dbUpdate($fields, 'bill_port_counters', "`port_id`='" . mres($port_id) . "' AND `bill_id`='$bill_id'") == 0) {
$fields['bill_id'] = $bill_id;
$fields['port_id'] = $port_id;
@@ -113,43 +113,42 @@ foreach ($query->get(['bill_id', 'bill_name']) as $bill) {
logfile("WATCH out! - Wrong counters. Table 'bill_port_counters' not updated");
}
////////////////////////////////EndCountersValidation&DB-Update
$delta = ($delta + $port_data['in_delta'] + $port_data['out_delta']);
$in_delta = ($in_delta + $port_data['in_delta']);
$delta = ($delta + $port_data['in_delta'] + $port_data['out_delta']);
$in_delta = ($in_delta + $port_data['in_delta']);
$out_delta = ($out_delta + $port_data['out_delta']);
}//end foreach
$last_data = getLastMeasurement($bill_id);
if ($last_data['state'] == 'ok') {
$prev_delta = $last_data['delta'];
$prev_in_delta = $last_data['in_delta'];
$prev_delta = $last_data['delta'];
$prev_in_delta = $last_data['in_delta'];
$prev_out_delta = $last_data['out_delta'];
$prev_timestamp = $last_data['timestamp'];
$period = dbFetchCell("SELECT UNIX_TIMESTAMP(CURRENT_TIMESTAMP()) - UNIX_TIMESTAMP('".mres($prev_timestamp)."')");
$period = dbFetchCell("SELECT UNIX_TIMESTAMP(CURRENT_TIMESTAMP()) - UNIX_TIMESTAMP('" . mres($prev_timestamp) . "')");
} else {
$prev_delta = '0';
$period = '0';
$prev_in_delta = '0';
$prev_delta = '0';
$period = '0';
$prev_in_delta = '0';
$prev_out_delta = '0';
}
if ($delta < '0') {
$delta = $prev_delta;
$in_delta = $prev_in_delta;
$delta = $prev_delta;
$in_delta = $prev_in_delta;
$out_delta = $prev_out_delta;
}
if (!empty($period) && $period < '0') {
if (! empty($period) && $period < '0') {
logfile("BILLING: negative period! id:$bill_id period:$period delta:$delta in_delta:$in_delta out_delta:$out_delta");
} else {
// NOTE: casting to string for mysqli bug (fixed by mysqlnd)
dbInsert(array('bill_id' => $bill_id, 'timestamp' => $now, 'period' => $period, 'delta' => (string)$delta, 'in_delta' => (string)$in_delta, 'out_delta' => (string)$out_delta), 'bill_data');
dbInsert(['bill_id' => $bill_id, 'timestamp' => $now, 'period' => $period, 'delta' => (string) $delta, 'in_delta' => (string) $in_delta, 'out_delta' => (string) $out_delta], 'bill_data');
}
}//end CollectData()
$poller_end = microtime(true);
$poller_run = ($poller_end - $poller_start);
$poller_end = microtime(true);
$poller_run = ($poller_end - $poller_start);
$poller_time = substr($poller_run, 0, 5);
dbInsert([
@@ -158,7 +157,7 @@ dbInsert([
'start' => $poller_start,
'duration' => $poller_time,
'devices' => 0,
'poller' => \LibreNMS\Config::get('distributed_poller_name')
'poller' => \LibreNMS\Config::get('distributed_poller_name'),
], 'perf_times');
if ($poller_time > 300) {
logfile("BILLING: polling took longer than 5 minutes ($poller_time seconds)!");