Commit Graph

11570 Commits

Author SHA1 Message Date
Neil Lathwood
d0d84503f1 Merge pull request #3994 from florianbeer/debug
Debug
2016-08-09 10:13:54 +01:00
Neil Lathwood
430526cd92 Merge pull request #4007 from murrant/powerconnect5324
Detect PowerConnect 5324 as powerconnect os
2016-08-09 10:08:53 +01:00
Tony Murray
7c7c615951 Detect PowerConnect 5324 as powerconnect os 2016-08-08 23:09:33 -05:00
Florian Beer
a50bb344ed This probably can be deleted since it was wrong 2016-08-09 02:57:45 +02:00
Neil Lathwood
b93a060458 Merge pull request #3997 from murrant/exceptions
addHost: Use Exceptions
2016-08-08 22:03:08 +01:00
Tony Murray
5643d3710d Actually add the exceptions 2016-08-08 15:47:35 -05:00
Tony Murray
322b79f717 Merge remote-tracking branch 'upstream/master' into exceptions 2016-08-08 15:43:47 -05:00
Tony Murray
409e756ca2 Merge pull request #3967 from Rosiak/comware-ver-fix
Comware Version Fix
2016-08-08 15:07:36 -05:00
Tony Murray
c97ef9651e Merge pull request #3989 from crcro/apps-fix
fixes for general apps page
2016-08-08 15:04:58 -05:00
Tony Murray
57661cf908 Merge pull request #3998 from Rosiak/issue-3995
Fix Dell PowerConnect Discovery
2016-08-08 15:02:48 -05:00
Tony Murray
741ff6cd18 Merge pull request #4004 from laf/php-lint
Added php lint checking for travis
2016-08-08 15:01:38 -05:00
laf
09eb5ca1e9 Fixed ./includes/polling/os/infinity.inc.php for php 53 2016-08-08 20:26:44 +01:00
laf
34feda8613 Fixed ./includes/polling/applications/rrdcached.inc.php for php 53 2016-08-08 20:20:18 +01:00
laf
bcd2476f32 Updated travis + added build icons 2016-08-08 20:13:33 +01:00
Neil Lathwood
c2efdcf248 Merge pull request #3996 from vitalisator/fix-syslog
Fix a bug in syslog
2016-08-08 20:06:00 +01:00
laf
544fd95a63 Updated to support php 5.3 2016-08-08 20:03:40 +01:00
laf
ec4535dae7 Added php lint checking for travis 2016-08-08 19:53:04 +01:00
Rosiak
057d78aab7 Remove more code 2016-08-08 18:34:30 +02:00
vitalisator
b438e94771 reduction, thx an @murrant 2016-08-08 17:36:19 +02:00
Tony Murray
1482e6e0a9 Update docs 2016-08-07 20:28:53 -05:00
Rosiak
d65364c8ef Fix Dell PowerConnect Discovery
#3995
2016-08-07 23:40:12 +02:00
Tony Murray
f3fc6f2906 Use Exceptions
Use exceptions for addHost()
Gets rid of silly mixed return and only returns the device_id.  Throwing an exception if we run into any issues.
Slightly modifies api add host output again to include device_id
2016-08-07 12:16:40 -05:00
vitalisator
330910b4e3 Fix a bug in syslog
since PR #3812 syslog writes to wrong device id in syslog table.
this happens on all devices where inet_pton() returns false.
2016-08-07 17:47:25 +02:00
Florian Beer
84f695e372 Fix: Failed opening file for inclusion 2016-08-07 15:39:30 +02:00
Florian Beer
22ef18793b Fix: Use of undefined constant yes - assumed 'yes' 2016-08-07 15:39:03 +02:00
crcro
a2e7726cd0 fixes for general apps page 2016-08-07 06:24:34 +03:00
Neil Lathwood
f1268848b0 Merge pull request #3984 from laf/issue-3981
Fixed syntax issue
2016-08-06 20:40:25 +01:00
laf
89b9f57ce0 Fixed syntax issue 2016-08-06 20:39:53 +01:00
Neil Lathwood
55db196877 Merge pull request #3964 from crcro/app-pages-addon
added missing apps to the generic app page
2016-08-06 20:37:55 +01:00
Neil Lathwood
e8d482ca30 Merge pull request #3983 from laf/docs-perf
Updated perf docs to include max repeaters
2016-08-06 20:34:22 +01:00
laf
bb7cddcc88 Updated perf docs to include max repeaters 2016-08-06 20:26:49 +01:00
crcro
bf85e00230 fixed typo and added dhcp-stats app 2016-08-06 19:55:40 +03:00
crcro
03358d56c4 Merge branch 'app-pages-addon' of https://github.com/crcro/librenms into app-pages-addon 2016-08-06 19:54:40 +03:00
Tony Murray
558bcf5971 Merge pull request #3976 from laf/issue-3953
Updated Junos detection
2016-08-06 01:30:21 -05:00
Neil Lathwood
2d23867a70 Merge pull request #3979 from florianbeer/memcached
Fix array element resolution bug
2016-08-06 00:57:36 +01:00
Neil Lathwood
b7dfd42227 Merge pull request #3977 from Rosiak/cisco-vss-state-support
Cisco VSS State Discovery
2016-08-06 00:52:11 +01:00
Florian Beer
7d362315c6 Fix array element resolution bug 2016-08-06 01:51:53 +02:00
Rosiak
4f6693c86f Cisco VSS State Discovery
Initial commit
2016-08-05 23:34:02 +02:00
Neil Lathwood
38cafef778 Merge pull request #3966 from ahmedsajid/powerconnect-patches
Added support for Dell Powerconnect 8024F CPUs
2016-08-05 22:22:35 +01:00
ahmedsajid
c678c10662 Update powerconnect.inc.php
Changed echos to d_echos
2016-08-05 17:18:24 -04:00
ahmedsajid
2ed9d46746 Update powerconnect.inc.php
Changed echos to d_echos
2016-08-05 17:18:11 -04:00
Neil Lathwood
d68949b724 Merge pull request #3971 from florianbeer/syslog
Syslog page updates
2016-08-05 22:11:41 +01:00
Neil Lathwood
d0188d86cf Merge pull request #3956 from ahmedsajid/eql-patches
Updates to Dell Equallogic storage disco/poll
2016-08-05 22:05:26 +01:00
laf
e053fcfcc5 Updated Junos detection 2016-08-05 20:33:25 +01:00
Tony Murray
08a2005acd Merge pull request #3949 from florianbeer/memcached
Add snmp polling capability for Memcached
2016-08-05 14:01:17 -05:00
Neil Lathwood
cdac67ddd8 Merge pull request #3972 from florianbeer/patch-1
Update rsyslog 5 template
2016-08-05 19:58:24 +01:00
Daniel Preussker
a4b0e506e7 Merge pull request #3975 from laf/install-clarification
Added a message to tell users that install.php is not the final step
2016-08-05 18:54:30 +00:00
Florian Beer
12f441b2bc Fix array return value
Scrutinizer bug, reset() expects a reference.
2016-08-05 20:53:48 +02:00
laf
2cf3fe160d Added a message to tell users that install.php is not the final step 2016-08-05 19:52:22 +01:00
Florian Beer
69166e37a9 Resolve merge conflicts 2016-08-05 20:51:22 +02:00