Commit Graph

11070 Commits

Author SHA1 Message Date
laf
51918400a2 ampage to amperage 2016-07-01 10:12:34 +01:00
laf
be12871a34 Fixed speeling mistake :) 2016-06-30 21:44:43 +01:00
laf
03b9dc1920 Renamed sql file 2016-06-30 21:38:40 +01:00
laf
d7b158fd2c Added some more macros and alert templates 2016-06-30 21:37:01 +01:00
Neil Lathwood
bd7b4fe92a Merge pull request #3754 from pblasquez/patch-6
Support rates >17.1gb/s
2016-06-30 21:14:28 +01:00
Neil Lathwood
69e0bcfb1c Merge pull request #3757 from Rosiak/issue-3756
Add sysName to ajax_search
2016-06-30 20:38:26 +01:00
Rosiak
086ded6ceb Add sysName to ajax_search
#3756
2016-06-30 21:36:43 +02:00
pblasquez
61544e5791 Changed to one line 2016-06-30 11:59:46 -07:00
Neil Lathwood
779efb0d52 Merge pull request #3753 from pblasquez/patch-5
add port_id to sql statement
2016-06-30 19:54:16 +01:00
pblasquez
2759bf0725 Support rates >17.1gb/s 2016-06-30 10:29:22 -07:00
pblasquez
48d8b3f09c add port_id to sql statement 2016-06-30 10:09:16 -07:00
Neil Lathwood
1f903af464 Merge pull request #3743 from spinza/mtikmib
Update Mikrotik MIB to revision "201604010000Z"
2016-06-30 08:46:03 +01:00
Neil Lathwood
a7cf105b68 Merge pull request #3730 from cschoonover91/issue-3729
Added additional DNOS polling for hardware/firmware version
2016-06-30 08:45:20 +01:00
Tony Murray
77186bac78 Merge pull request #3739 from paulgear/register-mib-debug
Use debug echo on register_mib to prevent interfering with API
2016-06-29 09:49:14 -05:00
SpinZA
f017ef3876 Updated Mikrotik MIB revision "201604010000Z" downloaded from http://download2.mikrotik.com/Mikrotik.mib and this link was found on this page: http://wiki.mikrotik.com/wiki/Manual:SNMP 2016-06-29 02:15:32 +02:00
Tony Murray
2faa2669ed Merge pull request #3742 from laf/issue-3514
Fixed bad SQL query for bgp-peer disco
2016-06-28 19:07:50 -05:00
laf
431b0f085f Fixed bad SQL query for bgp-peer disco 2016-06-29 00:32:33 +01:00
Neil Lathwood
025929c961 Merge pull request #3737 from murrant/huawei
Support Huawei SmartAX products.
2016-06-29 00:26:26 +01:00
Paul Gear
4fa4dc2723 Use debug echo on register_mib to prevent interfering with API 2016-06-29 07:57:54 +10:00
Tony Murray
5f5db66eaa Support Huawei SmartAX products.
Use ifName for display.
ifIndex values exceed 32bit, change ifIndex columnt to bigint
2016-06-28 14:20:04 -05:00
Tony Murray
480135349c Merge pull request #3736 from Optic00/master
Added latest Sophos UTM sysDesc
2016-06-28 12:14:39 -05:00
Optic00
92806bfaf4 agree
I agree to the conditions of the Contributor Agreement contained in
doc/General/Contributing.md.
2016-06-28 18:51:49 +02:00
Optic00
d87b46e2f6 Added latest Sophos UTM sysDesc
added sysDesc of Sophos UTM up to 06/28/16 for discovery
2016-06-28 18:40:32 +02:00
Neil Lathwood
d6ab3feaeb Merge pull request #3733 from tijmenNL/issue-3732
Invalid query to get devices in networkmap when XDP is used.
2016-06-28 10:55:00 +01:00
Tijmen de Mes
fa94c8953c Fixed invalid query to get devices in networkmap when XDP is used. 2016-06-28 11:44:35 +02:00
Tijmen de Mes
cab63b42cb I agree to the conditions of the Contributor Agreement
contained in doc/General/Contributing.md.
2016-06-28 11:39:51 +02:00
Casey Schoonover
d3569140cd Removed some unnecessary whitespace 2016-06-27 10:23:08 -05:00
Casey Schoonover
35ad2004f6 Added additional DNOS polling for hardware/firmware version 2016-06-27 10:22:23 -05:00
Neil Lathwood
692c29cbd8 Merge pull request #3576 from Exa-Omicron/master
Enabling "Random access" lookups fixes "MIB: Could not find all::enterprises.xxx" error
2016-06-27 11:04:03 +01:00
Neil Lathwood
cae602b28e Merge pull request #3724 from laf/pretty-fix-fix
Fixed bug in poller time response
2016-06-26 14:39:59 +01:00
laf
9602f8467a Fixed bug in poller time response 2016-06-26 14:38:33 +01:00
Søren Rosiak
7356464153 Merge pull request #3718 from laf/pretty-fix 2016-06-24 18:46:29 +02:00
laf
6ba32ebe5c Fix for polling/discovery function issue 2016-06-24 15:32:19 +01:00
Daniel Preussker
33b262125d Merge pull request #3682 from laf/eventlog-device-id
Added device_id to eventlog table
2016-06-24 12:49:13 +00:00
Daniel Preussker
bb7e83b7a3 Merge pull request #3715 from pblasquez/patch-4
Optimize map SQL
2016-06-24 12:43:50 +00:00
Neil Lathwood
75a2a668fd Merge pull request #3705 from Rosiak/issue-3529
Cisco SB SG220 Fix
2016-06-24 10:45:28 +01:00
Neil Lathwood
a6ffe466af Merge pull request #3711 from rucarrol/bsd_snmp_end_of_mib
Update snmp.inc.php
2016-06-24 10:41:44 +01:00
Neil Lathwood
fc90c2e6bb Merge pull request #3712 from Rosiak/issue-3707
Basic EMC FlareOS Support
2016-06-24 10:40:02 +01:00
Neil Lathwood
6f3fcf1ded Merge pull request #3713 from Rosiak/issue-3708
Enhance Brocade Fabric OS Support
2016-06-24 10:39:37 +01:00
pblasquez
a3d2e1b439 Optimize map SQL
Changing LEFT joins to INNER joins brought a 70k result down from 4.1s to 1.7 in my testing.  The only benefit to LEFT joins is to retrieve rows with no match, but we filter those rows out in the WHERE clause.

Was able to map interconnections between 254 devices in 47s with both 'mac' and 'xdp' options turned on.
2016-06-23 22:45:41 -07:00
Tony Murray
9c5017f8dc Merge pull request #3694 from laf/pretty-disco-poller
Prettify the poller + disco output
2016-06-23 14:37:20 -05:00
Rosiak
a33bf6aed4 Enhance Brocade Fabric OS Support
#3708

Also remove duplicate code.
2016-06-23 17:52:03 +02:00
Rosiak
4ffbcd75de Basic EMC FlareOS Support
#3707
2016-06-23 17:38:27 +02:00
Tony Murray
53fa8d52a7 Merge pull request #3701 from geordish/correct-packets
Remove superfluous \ from port packets graph
2016-06-23 10:27:10 -05:00
Tony Murray
d01804dc8a Merge pull request #3704 from laf/issue-3699
Fixed all maintenance windows appearing as having lapsed
2016-06-23 10:25:48 -05:00
Ruairi Carroll
64c55acecd Update snmp.inc.php
Catching BSD 'End of MIB' messages and stripping it out.
2016-06-23 13:19:12 +02:00
Søren Rosiak
5262bb0ea9 Small change. 2016-06-22 21:58:09 +02:00
Søren Rosiak
82cf34ec35 Cisco SB SG220 Fix
#3529
2016-06-22 21:47:09 +02:00
Tony Murray
47afbd5701 Merge pull request #3697 from laf/issue-1911
Added ability to search graylog using the resolved IP we now store
2016-06-22 14:03:30 -05:00
laf
067f0f8d67 Updated if check for device ip 2016-06-22 19:39:47 +01:00