10888 Commits

Author SHA1 Message Date
9f94b278d3 Sort poller/discovery modules without affecting the $config order 2016-06-08 23:29:33 -05:00
4d0c06f50c Merge pull request #3626 from librenms/revert-3612-sort_defaults
Revert "Sort many items in defaults.inc.php"
2016-06-08 15:35:00 -05:00
c3dfba4a20 Revert "Sort many items in defaults.inc.php" 2016-06-08 15:34:11 -05:00
f50bfc9e97 Merge pull request #3612 from murrant/sort_defaults 2016-06-08 20:42:49 +02:00
be18ad5dc1 Merge pull request #3619 from geordish/fix-config-markup
Fix Markup on config documentation page
2016-06-08 13:32:26 -05:00
30428ae959 Merge pull request #3623 from Rosiak/ibm-bladecenter
Add IBM BladeCenter Switch Support
2016-06-08 13:31:40 -05:00
9a8b133d8f Add IBM BladeCenter Switch Support
#3620
2016-06-08 20:26:28 +02:00
c2bf94254d Fix Markup on config documentation page 2016-06-08 09:23:43 +01:00
de7715acab Merge pull request #3614 from librenms/laf-patch-1
Updated includes/polling/functions.inc.php to include full path file
2016-06-07 06:38:57 -05:00
0da39d9f7b Updated includes/polling/functions.inc.php to include full path file
Updated includes/polling/functions.inc.php to include full path file will fix weathermap
2016-06-07 12:30:44 +01:00
c6f9c38ee9 Merge pull request #3613 from librenms/revert-3597-rollup_graphs
Revert "deduping type_where code, adding manual types to graph widgets "
2016-06-07 09:15:14 +01:00
5cb9d751c3 Revert "deduping type_where code, adding manual types to graph widgets " 2016-06-07 09:15:04 +01:00
c6112d9a43 Sort many items in defaults.inc.php
The main target is the poller and discovery modules
2016-06-06 23:45:19 -05:00
db6ccf1404 Merge pull request #3611 from murrant/roomalert3e
Draw graphs for avtech switch state.
2016-06-06 19:18:51 -05:00
b37d0f2e9e Draw graphs for avtech switch state. 2016-06-06 19:17:19 -05:00
722df8da89 Merge pull request #3599 from murrant/roomalert3e
Roomalert3e
2016-06-06 21:47:04 +01:00
ad8ecb0f82 Switch support for Avtech RoomAlert 4E 2016-06-06 15:44:55 -05:00
807e3dfe61 Fix avtech switch type sensors 2016-06-06 15:33:41 -05:00
cbbe040ae4 Merge pull request #3607 from geordish/issue-3605
Resolving issues on #3605
2016-06-06 19:02:11 +01:00
142e11f9d8 Merge pull request #3597 from brandune/rollup_graphs
deduping type_where code, adding manual types to graph widgets
2016-06-06 18:59:40 +01:00
c7ec9aa8bf Merge pull request #3589 from murrant/device-groups-pivot
Store device group relationships in a pivot table.
2016-06-06 18:20:53 +01:00
e7c74d8bc5 Resolving issues on #3605 2016-06-06 15:09:31 +01:00
9393c0e716 Fixes for the Avtech sensor state 2016-06-04 10:09:43 -05:00
145ce879d5 Merge pull request #3600 from murrant/rrdcached
Alphabetize the apps list
2016-06-04 07:28:01 +01:00
cfdbc6f93d Merge pull request #3596 from murrant/ds-var-fix
Rename $ds to $ldap_connection
2016-06-04 07:23:59 +01:00
bf471698ef Change the rest of the $ds variables to $ldap_connection 2016-06-03 22:16:10 -05:00
fcd7ed6dda if -> elseif 2016-06-03 21:51:17 -05:00
f4cfd61aef Capitalize state descriptions 2016-06-03 21:48:24 -05:00
b54f449ed8 Add Avtech switch support 2016-06-03 21:44:21 -05:00
1a60b7301f Initial support for RoomAlert3E
Doesn't support switch yet as, avtech_add_sensor doesn't handle state type sensors.
2016-06-03 21:28:56 -05:00
29c8f55580 Merge pull request #3598 from laf/issue-3584
Added detection for Samsung C series printers
2016-06-03 21:08:04 -05:00
a68687de5e Alphabetize the apps list 2016-06-03 21:05:09 -05:00
1aa7517372 giving graph widgets option to manually specify port type 2016-06-03 16:05:05 -07:00
laf
ac63e0a6be Added detection for Samsung C series printers 2016-06-03 20:14:32 +00:00
2ebdb3c083 Update CentOS-image.md 2016-06-03 20:19:53 +01:00
5117f5330a Update Ubuntu-image.md 2016-06-03 20:14:41 +01:00
3b4964e13c create common method for generating type_wheres 2016-06-03 10:42:16 -07:00
dcffc8381a adding name to authors and signing contributors agreement
I agree to the conditions of the Contributor Agreement
    contained in doc/General/Contributing.md.
2016-06-03 10:25:56 -07:00
9b0bd4c15a Rename $ds to $ldap_connection
$ds is a global variable, there are many name collisions in the code.  Rename it to avoid the collisions.
2016-06-03 10:56:42 -05:00
af8cc3a24b SQL query on one line 2016-06-02 16:22:17 -05:00
f3e79af61b Merge pull request #3579 from murrant/index_nginx_again
Check that variables are set before using them.
2016-06-02 22:17:44 +01:00
003bfab0d3 Merge pull request #3588 from Rosiak/fix-typo-thing
Fix typo..
2016-06-02 22:17:06 +01:00
3655051782 Merge pull request #3587 from Rosiak/buffalo-support
Basic Buffalo TeraStation Support
2016-06-02 22:16:46 +01:00
167aabb9ff Merge pull request #3582 from geordish/move-os-logo
Moved image to correct location
2016-06-02 22:12:59 +01:00
2d02d90eef Merge pull request #3580 from murrant/lsb-distro
Use lsb_release in the distro script
2016-06-02 22:12:47 +01:00
009840bf8a Store device group relationships in a pivot table. 2016-06-02 13:25:01 -05:00
edd3d61fc8 Fix typo.. 2016-06-02 18:59:43 +02:00
df8514e143 Basic Buffalo TeraStation Support
#3492
2016-06-02 18:48:36 +02:00
8f40d0d0e6 Merge pull request #3586 from laf/security
Resolved some security issues
2016-06-02 10:59:12 +01:00
laf
db0e1ca203 Resolved some security issues 2016-06-02 06:56:45 +00:00