Commit Graph

2628 Commits

Author SHA1 Message Date
Mark Schouten 30e47b382c Do not include the applications, but enable them in the database. The application poller will run them. Also, reduce code-duplication. 2015-08-20 12:36:37 +02:00
Mark Schouten e2f5a1fdf0 Make app-recognition more efficient 2015-08-20 12:25:47 +02:00
f0o 515b01c2bd Add basic Pushbullet transport. 2015-08-19 19:03:26 +00:00
laf e515760788 Make new dashboard the default 2015-08-18 18:40:57 +00:00
laf 987634e463 Updated rrdtool_update() to use new array format 2015-08-18 16:26:55 +00:00
vitalisator 009cfdf13f ource of MIBs is www.pbnglobal.com 2015-08-17 20:44:52 +02:00
vitalisator 5fea54ca6a add NMS-LLDP-MIB discovery for PBN devices 2015-08-17 18:12:49 +02:00
Vitali Kari 33cadbd620 Revert "PBN devices support CDP but does not output like Cisco so using a dif…" 2015-08-16 23:51:41 +02:00
Jimmy Cleuren 2d1228adb2 Correct DSM upgrade status OID 2015-08-15 10:09:10 +02:00
Neil Lathwood 0737722cb8 Merge pull request #1667 from miken32/master
changes needed to run under a web server subdirectory
2015-08-14 15:05:29 +01:00
Daniel Preussker 97efcaef15 Merge pull request #1659 from laf/mysql-strict
Couple more mysql strict fixes
2015-08-13 12:33:29 +02:00
Daniel Preussker 409b2efd17 Merge pull request #1647 from laf/issue-12-new
Added mysqli support
2015-08-12 22:06:09 +02:00
laf a8c03ca786 Last fix 2015-08-12 19:55:37 +00:00
Neil Lathwood 3921a6fc8b Merge pull request #1609 from SaaldjorMike/remove-unused
Removed unused default variables
2015-08-12 20:45:03 +01:00
laf 8bb2314534 Erm, no idea what that is doing in there! 2015-08-12 15:48:04 +00:00
Mike Rostermund af80d4539b Removed unused default variables. 2015-08-12 17:10:32 +02:00
Michael Newton f77c712bfc changes needed to run under web server subdirectory 2015-08-11 14:54:05 -07:00
Søren Rosiak 060b0e3e22 Merge pull request #1660 from laf/issue-1652 2015-08-11 22:33:42 +02:00
Neil Lathwood 945ca7f2ea Revert "changes needed to run under web server subdirectory" 2015-08-11 21:25:23 +01:00
laf 936fb32a9e Used oid instead of static 2015-08-11 20:20:02 +00:00
laf b1fcc3c84b updated firmware to version 2015-08-11 20:11:04 +00:00
Neil Lathwood f266aa044b Merge pull request #1661 from mmarchand/issue-1641
Update IOS-XR watts to be dbm sensor as well
2015-08-11 18:45:15 +01:00
Neil Lathwood 1b6b57b593 Merge pull request #1645 from miken32/master
changes needed to run under web server subdirectory
2015-08-11 18:32:53 +01:00
laf efee54043a Swapped 2012 Datacenter / Non-DC around 2015-08-11 16:05:04 +00:00
Mickael Marchand 011181c622 IOS-XR does not provide dbm values for transceivers so we calculate them from mWatts entries
Fix #1641
2015-08-11 16:35:29 +02:00
laf c652cb652e Added serial,version, cpu and mem for zywall 2015-08-11 12:32:54 +00:00
laf 9925e35224 Couple more mysql strict fixes 2015-08-11 11:38:05 +00:00
tony Ditchfield 81ed33ee71 Fixed Synology System Temerature being overwritten 2015-08-09 19:10:48 +01:00
Daniel Preussker 15a338061d Merge pull request #1582 from laf/issue-1461-old
Updated network to support old style format, docs provided
2015-08-09 12:10:08 +00:00
laf 4b49c148b6 Added mysqli support 2015-08-08 19:27:18 +00:00
Michael Newton cc0f449fc9 changes needed to run under web server subdirectory 2015-08-07 11:10:43 -07:00
Gerben Meijer 7817890b80 Fix parenthesis typo 2015-08-07 17:11:12 +02:00
Gerben Meijer 5467756328 Generalise mapping ifDescr to ifAlias
This allows both per OS enforcing of ifDescr = ifAlias as well as populating
when ifAlias = '' or NULL
2015-08-07 17:07:26 +02:00
Gerben Meijer 2dd8fe0553 Reorder ifalias_null check to prevent var flapping
This needs to run before IF-MIB data update, and needs to check and set
$this_port['ifAlias'] only as to not break the $data_oids loop.
2015-08-07 16:41:33 +02:00
Daniel Preussker d553c69236 Merge pull request #1632 from infernix/ifalias-null
Properly reference ifalias_null config flag
2015-08-07 09:27:31 +00:00
Daniel Preussker d628094f36 Merge pull request #1639 from laf/windows-fix
Updated Windows build versions + added server type for windows os
2015-08-07 09:16:54 +00:00
laf 023e42a101 Updated Windows build versions + added server type for windows os 2015-08-06 20:00:36 +00:00
Gerben Meijer 5e68b2e6e1 Also update $this_port for port descr parsing 2015-08-06 17:57:53 +02:00
Gerben Meijer f016c84981 Properly reference ifalias_null config flag
Fixes an issue introduced in 9908eb2e37
2015-08-06 16:51:02 +02:00
Søren Rosiak 9223f8953c Fix uptime issues introduced in #1610
As stated
2015-08-06 10:43:17 +02:00
Daniel Preussker 7cb45421fa Merge pull request #1623 from laf/issue-740
Updated discovery to log new type + updated eventlog page to show this
2015-08-06 05:48:41 +00:00
laf 746c52046b Updated discovery to log new type + updated eventlog page to show this 2015-08-05 20:05:45 +00:00
laf de0f9ee697 PBN devices support CDP but does not output like Cisco so using a different function to grab the first array needed 2015-08-04 20:37:05 +00:00
Paul Gear a10c488915 Merge pull request #1611 from SaaldjorMike/remove-php-closing-tags
Remove php closing tags to fix scrut issues
2015-08-05 06:32:12 +10:00
Mike Rostermund 0cc3e1a9e2 Remove php closing tags to fix scrut issues 2015-08-04 19:29:43 +02:00
Mike Rostermund 5369112d48 Fix some scrutinizer coding style issues 2015-08-04 18:36:03 +02:00
Søren Rosiak 86827f559e Perle Media Converter Detection
- Basic support for Perle Media Converters, tested on a SMI-10G-STS
chassis
- MIB is available from
http://download.perle.com/Media%20Converters/v1.8/mcr_mgt/snmp/perle-mcr-mgt.MIB
has been converted with dos2unix
- Perle has given me permission to use their logo
2015-08-04 10:58:09 +02:00
David M. Syzdek b5db25c436 Adding ORDER BY so device groups are sorted by name instead of creation.
Currently the function for retrieving device_groups returns rows in the order
in which they were created.  This causes the WebUI to display is a semi-random
order.  This patch causes the devices to be sorted by name which makes the
group lists easier to navigate.
2015-08-03 15:18:21 -08:00
Daniel Preussker d4a47c3083 Merge pull request #1600 from Rosiak/pcoweb_state
PCOWEB improvement
2015-08-03 18:20:40 +00:00
Daniel Preussker dbefe0c882 Merge pull request #1594 from vitalisator/issue-1593
add support for Google API key in geocoding
2015-08-03 17:41:49 +00:00