From d0e803340e908bffe08b7bf684f7234cd28286f7 Mon Sep 17 00:00:00 2001 From: laf Date: Fri, 21 Aug 2015 21:02:05 +0000 Subject: [PATCH] More updates --- includes/influxdb.inc.php | 3 +-- includes/polling/ports.inc.php | 8 ++++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/includes/influxdb.inc.php b/includes/influxdb.inc.php index abb087964..2f844e274 100644 --- a/includes/influxdb.inc.php +++ b/includes/influxdb.inc.php @@ -24,7 +24,7 @@ function influxdb_connect() { $influxdb_cred = $config['influxdb']['username'].':'.$config['influxdb']['password'].'@'; d_echo('Using authentication for InfluxDB'); } - $influxdb_url = $influxdb_cred.$influxdb_cred.$config['influxdb']['host'].':'.$config['influxdb']['port'].'/'.$config['influxdb']['db']; + $influxdb_url = $influxdb_cred.$config['influxdb']['host'].':'.$config['influxdb']['port'].'/'.$config['influxdb']['db']; d_echo($config['influxdb']['transport'] . " transport being used"); if ($config['influxdb']['transport'] == 'http') { $influxdb_conn = 'influxdb'; @@ -68,7 +68,6 @@ function influx_update($device,$measurement,$tags=array(),$fields) { ) ); $result = $influxdb->writePoints($points); - d_echo($result); } else { print $console_color->convert('[%gInfluxDB Disabled%n] ', false); diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php index 92696c64f..eeab346da 100644 --- a/includes/polling/ports.inc.php +++ b/includes/polling/ports.inc.php @@ -511,8 +511,12 @@ foreach ($ports as $port) { rrdtool_update("$rrdfile", $fields); - $fields['ifSpeed'] = $port['ifSpeed']; -print_r($this_port); + $fields['ifInUcastPkts_rate'] = $port['ifInUcastPkts_rate']; + $fields['ifOutUcastPkts_rate'] = $port['ifOutUcastPkts_rate']; + $fields['ifInErrors_rate'] = $port['ifInErrors_rate']; + $fields['ifOutErrors_rate'] = $port['ifOutErrors_rate']; + $fields['ifInOctets_rate'] = $port['ifInOctets_rate']; + $fields['ifOutOctets_rate'] = $port['ifOutOctets_rate']; $tags = array('ifName' => $this_port['ifName']); influx_update($device,'ports',$tags,$fields);