Commit Graph

1112 Commits

Author SHA1 Message Date
Tony Murray
c8ae2f6dd2 Merge branch 'master' into avtech 2016-02-23 09:51:34 -06:00
Tony Murray
7b2974f0c4 Memory precision is kb. 2016-02-22 23:59:16 -06:00
Tony Murray
ea3eedf3f0 Netonix Update
Add copyright header
Add support for CPU and memory
Fix version display for 1.3.9
Improve fan description
2016-02-22 23:12:12 -06:00
Daniel Preussker
4248617e8a Merge pull request #3049 from laf/updown
Added reason why device goes up/down to eventlog
2016-02-22 07:15:54 +00:00
laf
9820b3c2a0 Re-added Junos prefix support :/ 2016-02-20 18:08:39 +00:00
laf
4f3aceef5a Added reason why device goes up/down to eventlog 2016-02-20 16:09:37 +00:00
Daniel Preussker
fbea6e2db9 Merge pull request #3021 from murrant/uptime_timeticks
Use raw timeticks instead of parsing the string for sysUpTime and hrSystemUptime
2016-02-18 15:28:26 +00:00
Tony Murray
d2a072cb86 Merge branch 'master' into avtech 2016-02-17 11:55:08 -06:00
laf
fc8b4b4068 Fix cisco snmp query 2016-02-17 16:30:22 +00:00
laf
3c35b0e336 Fix cisco snmp query 2016-02-17 16:17:01 +00:00
laf
27306fbb6b Fix cisco snmp query 2016-02-17 16:09:09 +00:00
Tony Murray
9ccf16dd24 Use raw timeticks instead of parsing the string for sysUpTime and hrSystemUptime 2016-02-16 23:46:31 -06:00
Tony Murray
0c2abe5b77 Properly parse sysDescr fro Unifi Switches
Fix issue #2759
I only tested the regex, not against hardware as I don't have access to any.
2016-02-16 22:51:42 -06:00
Paul Gear
1a905f2a1a Merge pull request #2990 from laf/issue-2613
Reverted fortigate cpu update from Dec 2015
2016-02-17 07:53:44 +10:00
laf
cf54684279 Fixed ipv6 bgp polling on junos 2016-02-16 09:48:20 +00:00
laf
f1a3b9da34 Fixed ipv6 bgp polling on junos 2016-02-16 09:17:59 +00:00
HenocKA
0161260b17 merging 2016-02-13 21:48:26 +01:00
laf
444d6a7a8c Reverted fortigate cpu update from Dec 2015 2016-02-12 13:38:22 +00:00
laf
8c53a94233 Removed old alerting dbInsert code 2016-02-11 22:27:36 +00:00
Søren Rosiak
6456bc4fec Merge pull request #2967 from laf/issue-2870 2016-02-11 22:59:06 +01:00
Neil Lathwood
fa783dc07e Merge pull request #2841 from adaniels21487/issue-2665
Cisco OTV
2016-02-10 19:49:59 +00:00
HenocKA
21e37c23a7 merging - update schema 2016-02-10 07:20:34 +01:00
Neil Lathwood
da9f6e5343 Merge pull request #2962 from arrmo/master
Updates for Windows 10
2016-02-09 23:21:40 +00:00
Neil Lathwood
29f3dac9be Merge pull request #2972 from murrant/issue-2883
Deal with 0 value for sensor data better.
2016-02-09 21:11:26 +00:00
Tony Murray
e3ec42c06d Deal with 0 value for sensor data better.
Issue #2883
2016-02-09 14:20:36 -06:00
Neil Lathwood
fabcd84de7 Merge pull request #2959 from murrant/netonix
Add hardware and version for Netonix.
2016-02-09 20:07:42 +00:00
Neil Lathwood
758facd4bf Merge pull request #2958 from murrant/calix
Calix Support
2016-02-09 20:06:27 +00:00
Neil Lathwood
f074f25be2 Revert "Revert "Added location_map_regex"" 2016-02-09 19:02:38 +00:00
Daniel Preussker
1110836662 Revert "Added location_map_regex" 2016-02-09 20:00:54 +01:00
Neil Lathwood
3b19af910b Merge pull request #2935 from pblasquez/pblasquez-location_map_regex
Added location_map_regex
2016-02-09 18:56:55 +00:00
laf
135bbdcc43 Updated bgp-peers polling so that an snmpwalk isn't done for each bgp peer 2016-02-09 18:23:31 +00:00
Tony Murray
f6e6263c59 Initial AVTECH Software, Inc. support. 2016-02-09 12:00:58 -06:00
Tony Murray
1b59ae9648 Use $config['mibdir'] instead of $config['mib_dir'] 2016-02-09 08:01:41 -06:00
arrmo
f2054d369b Updates for Windows 10 2016-02-08 20:15:11 -06: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
f177dd6608 Merge branch 'master' into calix 2016-02-08 14:20:14 -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
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
4aa9838eda add discover, polling and mibs.
work around empty ifDesc
2016-02-05 14:26:06 -06:00
pblasquez
937937aa09 Update core.inc.php 2016-02-04 16:10:28 -08: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
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