10652 Commits

Author SHA1 Message Date
71a57b6214 Allow for separate headers upon conditional 2016-04-28 14:30:03 -07:00
c295283807 Merge remote-tracking branch 'refs/remotes/librenms/master' into ajax_headers_1 2016-04-28 14:29:15 -07:00
940e98e41e Merge pull request #3428 from laf/issue-2856
Added check for php.ini timezone being set
2016-04-28 12:29:58 +01:00
53269367fb Merge pull request #3410 from pblasquez/min_graph_height
Make minimum graph height configurable
2016-04-28 12:29:32 +01:00
6d37d36354 Merge pull request #3255 from HenocKA/issue280b
VRF Lite Support - update
2016-04-28 12:22:01 +01:00
2c57979011 forgot to add back max() 2016-04-26 16:07:20 -07:00
d4d2736954 Ajax Headers for Alert Forms 2016-04-26 14:39:10 -07:00
8e8315dbcd Move config to WebUI 2016-04-26 12:56:58 -07:00
add7aeba6b Merge remote-tracking branch 'refs/remotes/librenms/master' 2016-04-26 12:56:32 -07:00
aeafdf58e9 Merge remote-tracking branch 'refs/remotes/librenms/master' into min_graph_height 2016-04-26 12:56:19 -07:00
8d4c65b8e8 Revert "Make minimum height configurable"
This reverts commit 292fe5901b79d3dee84085074a8478cd62291dbf.
2016-04-26 12:43:49 -07:00
ca9caca264 Update poller.php 2016-04-26 15:30:07 +02:00
laf
ad45ade8a0 Added check for php.ini timezone being set 2016-04-26 13:08:21 +00:00
7066c27b0a Merge pull request #3427 from adaniels21487/issue-3405-1
Nagios Services - Status update
2016-04-26 13:34:37 +01:00
048b553926 Nagios Services - Status update
- Fixed summary widgets
2016-04-26 22:05:34 +10:00
7edf31ffd7 Merge pull request #3423 from murrant/schema-113
Don't drop an index on a table that was just created
2016-04-25 23:11:47 +01:00
36682e16f8 Merge pull request #3426 from adaniels21487/issue-3418
Bugfix: Services widget on device overview page
2016-04-25 23:11:32 +01:00
9349bc4e68 Merge pull request #3425 from adaniels21487/issue-3405
Nagios Services - Update Service Message in the database when it has changed.
2016-04-25 23:11:13 +01:00
4545aea28d - Services widget on device overview page was still displaying legacy status
while the database has been storing nagios style status.
  Modified to: 0=Ok, 1=Unknown, 2=Critical.
2016-04-26 07:04:22 +10:00
a5617d4985 - Update Service Message in the database when it has changed. 2016-04-26 06:46:22 +10:00
40b598d9af Don't drop an index on a table that was just created 2016-04-25 14:55:51 -05:00
59428bbe44 Merge pull request #3256 from HenocKA/issue280-route
VRF Lite Support - adding route
2016-04-25 11:29:59 +01:00
c8b99e509a Merge pull request #3365 from rschueler/master
Support for Viprinet VPN Router
2016-04-25 11:28:43 +01:00
2afb0fed9e I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md. 2016-04-25 11:51:20 +02:00
f02bba3c11 Rename 115.sql to 113.sql 2016-04-25 10:17:05 +02:00
144acdfc49 renamed remaining viprinet.inc.php to viprinux.inc.php 2016-04-25 10:10:25 +02:00
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
1c4cf026d4 Renamed Viprinet to Viprinux. Icon size now 32x32 2016-04-25 08:26:46 +02:00
1c3869c5f0 Merge pull request #3416 from murrant/netonix-poe
Add PoE state to Netonix devices
2016-04-24 20:00:46 +01:00
295364da2d Merge pull request #3419 from murrant/php7
Correct stripos check
2016-04-24 14:13:15 +01:00
34281f2ccc Correct snmpwalk_cache_multi_oid() call 2016-04-24 08:03:59 -05:00
40759c511f Correct stripos check 2016-04-24 07:47:16 -05:00
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
1e309eebe2 Merge pull request #3363 from wiad/issue-3362
add config option for typeahead limit
2016-04-24 11:20:22 +01:00
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
7f50eca440 Merge pull request #3417 from murrant/php7
Improve PHP7 compatibility
2016-04-24 10:49:21 +01:00
b98ba8c1a4 Remove some deprecated functions 2016-04-24 01:05:14 -05:00
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
413d0b7c5e Merge pull request #3414 from murrant/power-alert
Change poweralert os detection to case insensitive.
2016-04-23 11:23:07 +01:00
0fa29b6d29 Change poweralert os detection to case insensitive.
Patch from Neil Lathwood
2016-04-22 21:39:48 -05:00
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
3bf0ad1c07 Merge pull request #3395 from cschoonover91/issue-3394
Added CPU temperature discovery/polling for DNOS
2016-04-22 09:43:25 +01:00
292fe5901b Make minimum height configurable 2016-04-21 22:20:53 -07:00
451081104d Merge remote-tracking branch 'refs/remotes/librenms/master' 2016-04-21 22:09:50 -07:00
98bc1971af Merge remote-tracking branch 'refs/remotes/librenms/master' into min_graph_height 2016-04-21 22:09:08 -07:00
5d16702320 Merge pull request #3343 from Piratonym/issue-3336
Use python2 in Python script shebang lines
2016-04-22 13:33:00 +10:00
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