Commit Graph

3329 Commits

Author SHA1 Message Date
pblasquez
1b97bf069f Update rewrites.php 2016-02-08 16:09:16 -08:00
Tony Murray
21c2bb312a Do not hardcode mib path 2016-02-08 15:50:54 -06:00
Tony Murray
fc82587c3f Merge branch 'master' into netonix 2016-02-08 15:24:47 -06:00
Tony Murray
17fe1d1f66 I could not find cpu info in Calix MIBs. Just load in hr. 2016-02-08 15:01:25 -06:00
Tony Murray
f177dd6608 Merge branch 'master' into calix 2016-02-08 14:20:14 -06:00
Tony Murray
1d796fecfe Add a generic way to allow empty ifDescr on ports for an OS. 2016-02-08 13:58:03 -06:00
HenocKA
24df0a059c merging 2016-02-08 20:12:05 +01:00
Tony Murray
799bb4dc5d Pull card serial numbers. Unsure if this what we want.
Set ifName as the primary port name.
2016-02-08 10:29:55 -06: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
Daniel Preussker
0dc9219e56 Merge pull request #2949 from gottaloveit/master
add Dell Networking sysObjectId
2016-02-07 14:34:10 +00:00
Daniel Preussker
a6e5bf1279 Merge pull request #2912 from laf/issue-2890
Added ifOperStatus and ifAdminStatus _prev values to db.
2016-02-07 14:25:16 +00:00
Joe Passavanti
6e35b97ea9 add Dell Networking sysObjectId
This is for Dell Networking N2048 switch
2016-02-07 05:08:37 -08:00
Daniel Preussker
e2151bfc66 Merge pull request #2908 from khobbits/master
Add ./validate.php -m rrdcheck
2016-02-07 11:47:33 +00:00
HenocKA
7a00d913a1 update branch 2016-02-06 06:52:21 +01:00
Tony Murray
6f31755dfb Use poll_device;
List the inserted cards in "features".
2016-02-05 18:14:44 -06:00
Tony Murray
a34b958352 Add hardware and version for Netonix. 2016-02-05 17:57:17 -06:00
Tony Murray
8eda8e0bfc Fix Oxidized node reloading. 2016-02-05 16:29:42 -06:00
Tony Murray
4aa9838eda add discover, polling and mibs.
work around empty ifDesc
2016-02-05 14:26:06 -06:00
Tony Murray
3970753c86 Merge remote-tracking branch 'upstream/master' into calix 2016-02-05 14:24:04 -06:00
Maximilian Wilhelm
6ef1cf9e43 Add ability to map ports based on their ifAlias.
Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
2016-02-05 11:40:37 +01:00
pblasquez
cf5b6ba121 Update rewrites.php 2016-02-04 16:11:38 -08:00
pblasquez
937937aa09 Update core.inc.php 2016-02-04 16:10:28 -08:00
Tony Murray
e7c59dbd57 Initial Calix E7 Support 2016-02-03 16:01:31 -06: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
ec5d0dfd89 Remove redundant code from port-{adsl,etherlike,poe} polling submodules.
$this_port already gets defined within include/polling/ports.inc.php
  so there's no need to redefine it again in each submodule.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
2016-02-03 21:14:25 +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
Paul Gear
a81776e77b Merge pull request #2862 from laf/issue-2859
Added ability to ignore device sensors from entity mib
2016-02-03 15:31:32 +10:00
laf
dc5f286b9a Added ifOperStatus and ifAdminStatus _prev values to db. 2016-02-02 13:47:13 +00:00
HenocKA
6de58f55df merging 2016-02-02 12:58:05 +01:00
Robert (KHobbits)
028b4300ba Slow polling loop 2016-02-02 11:36:49 +00:00
HenocKA
8a3d14f9e2 Correct data duplication on discovering cisco vrf lite 2016-02-02 12:21:45 +01:00
HenocKA
1890cfb990 Merge remote-tracking branch 'refs/remotes/librenms/master' into issue280 2016-02-02 12:15:56 +01:00
KHobbits
f2bad9816b Attempt to scare away scrutinizer issues. 2016-02-02 01:05:29 +00:00
KHobbits
5ebe6b44c0 Code clean up 2016-02-02 00:56:19 +00:00
KHobbits
92a7e5796d Add ./validate.php -m rrdcheck
This will loop through rrd files and highlight any corrupt files.
2016-02-01 23:29:37 +00:00
laf
37d72e1512 Merge branch 'master' of https://github.com/librenms/librenms into issue-2770 2016-01-31 18:17:59 +00:00
Rosiak
5dd9fed3e0 Wrong array value 2016-01-31 00:18:30 +01:00
Rosiak
3139239240 Do not discover a temp sensor which is not present
#2848
2016-01-31 00:16:39 +01:00
laf
725fbd2c08 Another fix 2016-01-30 10:10:16 +00:00
laf
f4820dad90 Fixed code to run with php 5.3 2016-01-30 10:05:46 +00:00
Neil Lathwood
b72c1282d9 Merge pull request #2797 from BarbarossaTM/issue-386-v2
Ability to use ifIndex,ifName and ifDescr to create and update port rrd files
2016-01-29 13:05:03 +00:00
Neil Lathwood
7c79d62baf Merge pull request #2840 from adaniels21487/issue-1851
Cisco CBQOS
2016-01-29 10:21:34 +00:00
Rosiak
e7e035305b Eaton Basics 2016-01-28 23:11:11 +01:00
Neil Lathwood
57a7549446 Merge pull request #2764 from vitalisator/stp
Add STP port polling and device information
2016-01-28 19:08:09 +00:00
HenocKA
47c830a15c bug correction on ospf polling module 2016-01-28 11:00:24 +01:00
Neil Lathwood
e00a35c2ff Merge pull request #2867 from paulgear/master
Update per-module poller performance collection
2016-01-28 09:41:09 +00:00
laf
3560a39b52 Updated thisisnotbullshit variable 2016-01-28 09:38:31 +00:00
Aaron Daniels
5897e30529 - Added poller and discovery debugging information. 2016-01-28 18:40:05 +10:00
Aaron Daniels
d96e2216a7 - Changed upper case variables to lower case. 2016-01-28 07:04:12 +10:00