Commit Graph

197 Commits

Author SHA1 Message Date
Neil Lathwood
0d2c443ee9 fix: Added ability to force devices to use ifEntry instead of ifXEntry (#4100) 2016-09-02 12:53:35 -05:00
Tony Murray
9284bc60ff Update code in includes to be PSR-2 compliant (#4220)
refactor: Update code in /includes to be psr2 compliant #4220
2016-08-28 18:32:58 +01:00
Mickael Marchand
63cdd8210d fix ifName randomly defined, breaking influxdb updates (#4202) 2016-08-25 11:55:27 +01:00
Neil Lathwood
e112302e40 Fixed not sending port_descr_type (#4188) 2016-08-24 11:01:56 -05:00
laf
ef7fac9a91 Fixed errors 2016-08-18 21:38:06 +01:00
laf
61e5aa6883 Update of ifSpeed checking in ports poller 2016-08-17 23:08:32 +01:00
Tony Murray
97daf3dd54 Merge remote-tracking branch 'upstream/master' into rrd-create-remote 2016-08-01 10:18:28 -05:00
laf
dc222c38a4 Stop more unnecessary db queries in ports polling 2016-08-01 00:10:24 +01:00
laf
07c227e01a Removed unecessary db lookups 2016-07-31 22:13:50 +01:00
Tony Murray
76d5311647 Update nfs-stats.inc.php to use data_update
filter tags in ports.inc.php, and update the phpdoc for rrd_array_filter()
2016-07-25 20:42:37 -05:00
Tony Murray
a1ab19047e Merge remote-tracking branch 'upstream/master' into rrd-create-remote 2016-07-07 21:28:47 -05:00
Tony Murray
57650e4ffc Remove nfs requirement for distributed poller (with rrdtool 1.5+)
Use data_update instead of rrd_update/rrd_create and influx_update
Centralize rrd file check so we can check against a remote rrdcached server too
Use rrd_name() to generate rrd file names
2016-07-07 21:10:06 -05:00
Tony Murray
debe052f56 Re-add missing data 2016-07-06 19:06:54 -05:00
Neil Lathwood
671288e74d Merge pull request #3648 from geordish/speed-up-port-polling
WIP: Attempt to speed up SNMP port polling
2016-07-06 21:46:27 +01:00
Dave Bell
43dc0e6194 Removed duplicate delecration, and improved test for valid data 2016-07-06 09:24:09 +01:00
Dave Bell
baa8191b4b Add ifInDiscards/ifOutDiscards 2016-07-05 16:20:40 +01:00
Dave Bell
689d32f50c Add ifInDiscards/ifOutDiscards 2016-06-30 21:49:48 +01:00
Dave Bell
40a87288e8 Copy packets over from hc index to non-index 2016-06-30 16:16:41 +01:00
laf
6690e31f9d Added ability to manually set ifSpeed 2016-06-30 09:49:30 +01:00
Dave Bell
f952e49f1c ifXEntry is also missing the errors OIDs... 2016-06-13 16:18:14 +01:00
Dave Bell
7c41121ef0 ifXEntry is missing ifAdminStatus and ifOperstatus. Adding Seperately 2016-06-13 15:52:35 +01:00
Dave Bell
6552c43689 Attempt to speed up SNMP port polling 2016-06-13 14:58:49 +01:00
f0o
4d0d78c48c Merge branch 'issue-386-v3' of git://github.com/BarbarossaTM/librenms
Conflicts:
	sql-schema/099.sql
2016-02-07 15:23:52 +00:00
Maximilian Wilhelm
76a29f41e3 Fix detection of deleted interfaces for ifName/ifDescr port association mode.
The previous ifIndex based port mapping schema did detect deleted ports
  by checking ports in the DB against the ports currently polled via SNMP
  which breaks when using another port mapping schema. This commit fixes
  problem by checking known and found ports by their port_id.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
2016-02-03 22:48:18 +01:00
Maximilian Wilhelm
5521002b37 Fix port association for adsl, etherlike and poe port information.
In 2c9df26bbf I broke the association of
  ports in the DB and ports just polled via SNMP for the adsl, etherlike
  and poe submodules and no one noticed. This fixes this issue. Sorry.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
2016-02-03 21:14:25 +01:00
Maximilian Wilhelm
79eab54fd9 Allow ignoring unmapable interfaces in poller.
When using the ifName or ifDescr as means to map discovered ports to
  known ports in the DB (think of port association mode) it's possible
  that we're facing the problem that the ifName or ifDescr polled from
  the device is unset or an empty string (like when querying some ubnt
  devices...). If this happends we have no way to map this port to any
  port found in the database. As reported this situation may occur for
  the time of one poll and might resolve automagically before the next
  poller run happens. Without this special case this would lead to new
  ports added to the database each time this situation occurs. To give
  the user the choice between »a lot of new ports« and »some poll runs
  are missed but ports stay stable« the 'ignore_unmapable_port' option
  has been added to configure this behaviour. To skip the port in this
  loop is sufficient as the next loop is looping only over ports found
  in the database and "maps back". As we did not add a new port to the
  DB here, there's no port to be mapped to.

  I'm using the in_array() check here, as I'm not sure if an "ifIndex"
  can be legally set to 0, which would yield True when checking if the
  value is empty().

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
2016-02-03 21:14:24 +01:00
laf
dc5f286b9a Added ifOperStatus and ifAdminStatus _prev values to db. 2016-02-02 13:47:13 +00:00
Maximilian Wilhelm
2c9df26bbf Update discovery and poller to allow stable interface mapping by ifName/ifDescr based port mapping.
By default libreNMS used the ifIndex to associate ports just found via SNMP
  with ports discoverd/polled before and stored in the database. On Linux boxes
  this is a problem as ifIndexes are rather likely to be unstable between reboots
  or (re)configuration of tunnel interfaces (think: GRE/OpenVPN/Tinc/...), bridges,
  Vlan interfaces, Bonding interfaces, etc.

  This patch adds a »port association mode« configuration option per device which
  allows to map discovered and known ports by their ifIndex, ifName, ifDescr, or
  maybe other means in the future.
  The default port association mode still is ifIndex for compatibility reasons.

  As port RRD files were stored by their ifIndex before, they are now identified
  by their unique and stable port_id to ensure a stable and unique mapping and
  allow future port association modes to be added without requireing any further
  internal changes. Existing RRD files are renamend accordingly in discovery and
  poller tools to ensure stability of port associations in both modules as we
  don't know which might run first after an update.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
2016-01-26 13:49:30 +01:00
laf
302ecb8858 Removed unused code in port poller for non-cisco devices 2016-01-19 11:25:03 +00:00
laf
0f33f6d1fa Rebased 2016-01-04 12:09:32 +00:00
Paul Gear
8aecf71910 Merge pull request #2552 from SaaldjorMike/bcast-mcast-ciscosb
Ignore HC Broadcast and Multicast Counters for Cisco SB as they're al…
2016-01-02 07:01:18 +10:00
laf
32f5980523 Some more tweaks 2015-12-23 15:12:42 +00:00
laf
8b63bfad30 Updated again 2015-12-23 11:40:17 +00:00
laf
0e33048339 Updated influx port data 2015-12-23 11:28:40 +00:00
laf
904a24d7ed Added some more tags for ports 2015-12-23 11:17:00 +00:00
Neil Lathwood
1ced3dff98 Merge pull request #2558 from vizay/brocade-vdx-support
Added full discovery and polling support for brocade VDX devices.
2015-12-18 15:57:27 +00:00
Neil Lathwood
73f09f129a Merge pull request #2542 from ekoyle/add_stats_to_db
Add stats to db
2015-12-10 21:15:20 +00:00
Eldon Koyle
bd23d9e56a This isn't the operator you are looking for. Move along. 2015-12-09 15:28:13 -07:00
Eldon Koyle
81d84e0f8b Always add 'extended' metrics to db and remove option 2015-12-08 09:54:31 -07:00
Daniel Preussker
a2d97f4283 Merge pull request #2458 from laf/rrdtune
Fix for crazy traffic values seen in graphs
2015-12-08 16:12:22 +00:00
vizay
c39c46aa18 Removed starting parenthesis causing syntax error 2015-12-06 10:53:43 +01:00
vizay
59b4ef7712 Added discovery and polling support for brocade VDX devices. Removed an obsolete value and check for ifAlias (in definitions and ports) since VDX nowdays report correct from ifAlias. Removed printing of interface numbers for vdx devices in the interface list since VDX devices do not report the expected ifIndex value like other switches do 2015-12-04 15:35:02 +01:00
Mike Rostermund
9b62235f25 Ignore HC Broadcast and Multicast Counters for Cisco SB as they're always 0 2015-12-03 22:00:39 +01:00
Eldon Koyle
1ee481ff6e Rename option to extended_port_metrics 2015-12-03 09:40:30 -07:00
Eldon Koyle
fcaf3d49ab Fix reference to non-existent variable
Use $port_id since $ports[$ifIndex]['port_id'] doesn't exist yet
2015-12-03 09:38:16 -07:00
Eldon Koyle
3f689045d9 Remove a couple of stray OIDs 2015-12-03 09:38:16 -07:00
Eldon Koyle
55c05c7866 Allow users to keep more statistics in the db
* Add $config['enable_extended_port_metrics'] to enable feature
* Add a new table to store stuff in
* Update data from the poller
2015-12-03 09:38:16 -07:00
laf
8460adc756 eth0 on AirFibre units get data from another MIB 2015-12-02 23:23:31 +00:00
laf
46b2fd7d1f Removed debug 2015-11-18 21:54:07 +00:00
laf
52e0be911b More updates 2015-11-17 05:38:45 -08:00