Commit Graph

10595 Commits

Author SHA1 Message Date
Neil Lathwood
59428bbe44 Merge pull request #3256 from HenocKA/issue280-route
VRF Lite Support - adding route
2016-04-25 11:29:59 +01:00
Neil Lathwood
c8b99e509a Merge pull request #3365 from rschueler/master
Support for Viprinet VPN Router
2016-04-25 11:28:43 +01:00
rschueler
2afb0fed9e I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md. 2016-04-25 11:51:20 +02:00
Sawachier
f02bba3c11 Rename 115.sql to 113.sql 2016-04-25 10:17:05 +02:00
Rainer Schueler
144acdfc49 renamed remaining viprinet.inc.php to viprinux.inc.php 2016-04-25 10:10:25 +02:00
Rainer Schueler
93e059f2c1 Merge branch 'master' of https://github.com/librenms/librenms
Conflicts:
	includes/services/check_dhcp.inc.php
2016-04-25 08:48:04 +02:00
Rainer Schueler
1c4cf026d4 Renamed Viprinet to Viprinux. Icon size now 32x32 2016-04-25 08:26:46 +02:00
Neil Lathwood
1c3869c5f0 Merge pull request #3416 from murrant/netonix-poe
Add PoE state to Netonix devices
2016-04-24 20:00:46 +01:00
Neil Lathwood
295364da2d Merge pull request #3419 from murrant/php7
Correct stripos check
2016-04-24 14:13:15 +01:00
Tony Murray
34281f2ccc Correct snmpwalk_cache_multi_oid() call 2016-04-24 08:03:59 -05:00
Tony Murray
40759c511f Correct stripos check 2016-04-24 07:47:16 -05:00
Neil Lathwood
7c61d1d892 Merge pull request #3415 from laf/validate-chown
Added command to chown install dir to correct user
2016-04-24 11:28:48 +01:00
Neil Lathwood
1e309eebe2 Merge pull request #3363 from wiad/issue-3362
add config option for typeahead limit
2016-04-24 11:20:22 +01:00
Neil Lathwood
287f8864e7 Merge pull request #3312 from thecityofguanyu/thecityofguanyu/ironware-netiron-mempool
Fix mempool reporting for Brocade IronWare NetIron devices
2016-04-24 11:02:17 +01:00
Neil Lathwood
7f50eca440 Merge pull request #3417 from murrant/php7
Improve PHP7 compatibility
2016-04-24 10:49:21 +01:00
Tony Murray
b98ba8c1a4 Remove some deprecated functions 2016-04-24 01:05:14 -05:00
Tony Murray
46a0bbfc82 Add PoE state to Netonix devices
Allow for non-numeric states.  state_descr must match what is returned by the device.
2016-04-23 20:56:21 -05:00
laf
e64483521b Added command to chown install dir to correct user 2016-04-23 15:13:43 +00:00
Neil Lathwood
413d0b7c5e Merge pull request #3414 from murrant/power-alert
Change poweralert os detection to case insensitive.
2016-04-23 11:23:07 +01:00
Tony Murray
0fa29b6d29 Change poweralert os detection to case insensitive.
Patch from Neil Lathwood
2016-04-22 21:39:48 -05:00
Søren Rosiak
9bbb49ca66 Merge pull request #3411 from laf/ipsec-api 2016-04-22 16:49:25 +02:00
laf
f801f63a99 Missing AND 2016-04-22 14:42:33 +00:00
laf
78204f3971 Added api call for ipsec tunnels 2016-04-22 13:41:38 +00:00
Neil Lathwood
3bf0ad1c07 Merge pull request #3395 from cschoonover91/issue-3394
Added CPU temperature discovery/polling for DNOS
2016-04-22 09:43:25 +01:00
Paul Gear
5d16702320 Merge pull request #3343 from Piratonym/issue-3336
Use python2 in Python script shebang lines
2016-04-22 13:33:00 +10:00
Paul Gear
b6f1f36722 Merge pull request #3408 from justmedude/master
only output the mib if there is a match
2016-04-22 13:31:59 +10:00
Vikram Adukia
42ffb6bf22 only output the mib if there is a match 2016-04-21 14:24:53 -07:00
Casey Schoonover
f837e5b2ac Merge branch 'master' of github.com:/cschoonover91/librenms into issue-3394 2016-04-21 10:49:03 -05:00
Tony Murray
b84c265c15 Merge pull request #3406 from laf/unix-agent-freebsd
Added support + docs for FreeBSD
2016-04-21 09:48:14 -05:00
laf
f90d69cef8 Added support + docs for FreeBSD 2016-04-21 14:38:21 +00:00
Adam Winberg
8ef8c33ba3 forgot setting typeahead_limit option for dash 2016-04-21 13:03:26 +02:00
Adam Winberg
9c58f70b57 Merge branch 'master' of https://github.com:/wiad/librenms into issue-3362 2016-04-21 12:57:37 +02:00
Adam Winberg
341869eaaf use existings webui option (global_search_result_limit) to set typeahead limit instead of introducing new config option 2016-04-21 12:56:45 +02:00
Neil Lathwood
6694accb32 Merge pull request #3401 from paulgear/services-sort-add
Sort services list
2016-04-21 09:11:06 +01:00
Sawachier
af192da397 Update route.inc.php 2016-04-21 09:17:20 +02:00
Paul Gear
2978cdc242 Merge pull request #3399 from xbeaudouin/distro_freebsd
Add FreeBSD detection to distro file
2016-04-21 08:16:00 +10:00
Paul Gear
c99fee75df Sort services list 2016-04-21 08:08:17 +10:00
Neil Lathwood
7cd957ce95 Merge pull request #3398 from thecityofguanyu/thecityofguanyu/contributing
Attempt at following contributing guidelines, round two
2016-04-20 22:17:17 +01:00
Casey Schoonover
2131774fcf Merge branch 'master' of github.com:/cschoonover91/librenms into issue-3394 2016-04-20 15:40:47 -05:00
Casey Schoonover
6bdb8fc096 Removed includes/polling/temperatures/dnos.inc.php - polling script appears unnecessary 2016-04-20 15:39:44 -05:00
xavier.beaudouin
1146080458 Add FreeBSD detection to distro file 2016-04-20 16:23:16 +02:00
thecityofguanyu
3c5dd2f19a I agree to the conditions of the Contributor Agreement
contained in doc/General/Contributing.md.
2016-04-20 09:20:50 -05:00
Sawachier
960d45ee46 Update route.inc.php
Change if condition
2016-04-20 14:09:04 +02:00
Sawachier
5ce6fcdef8 Update Discovery Support.md 2016-04-20 10:46:38 +02:00
Neil Lathwood
55edec811b Merge pull request #3397 from vectr0n/master
Update Nginx Install Doc
2016-04-20 09:40:38 +01:00
Neil Lathwood
36facca350 Merge pull request #3396 from adaniels21487/issue-2193-1
Nagios Services command for check_dhcp
2016-04-20 09:38:59 +01:00
vectr0n
98c491a70a Change Wording for AllowEncodedSlashes to make it more clear to users 2016-04-19 19:00:17 -04:00
vectr0n
a618707905 Update Nginx Install Doc 2016-04-19 18:08:30 -04:00
Chanowk
c4ec5447ec merging 2016-04-19 23:54:41 +02:00
Sawachier
683d0617c7 Update defaults.inc.php 2016-04-19 23:52:32 +02:00