Commit Graph
17185 Commits
Author SHA1 Message Date
Neil Lathwood cbbe040ae4 Merge pull request #3607 from geordish/issue-3605
Resolving issues on #3605
2016-06-06 19:02:11 +01:00
Neil Lathwood 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
laf d5bf3281af Fix syntax issue 2016-06-06 17:56:20 +00:00
Søren Rosiak 0951866486 Credit to Neil 2016-06-06 19:34:12 +02:00
Søren Rosiak 93f93aa660 Add polling 2016-06-06 19:31:46 +02:00
Neil Lathwood 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
laf ca86472fcc Added base support + sensors for IBM AMM 2016-06-06 17:15:23 +00:00
Dave Bell e7c74d8bc5 Resolving issues on #3605 2016-06-06 15:09:31 +01:00
Guillaume COEUGNET 0b0881ae94 Remove doc files and change code indent 2016-06-06 11:49:50 +02:00
Guillaume COEUGNET 6c8a75a5f7 Change procedure management. Using URL instead of file 2016-06-06 11:41:41 +02:00
Josh Driver 72cebe413e Improvements for the link selection for the Network Map
Currently the Network Map will draw multiple links between
devices and ports, overlapping themselves on the graph. The
criteria used to select the link is also unspecified.

Instead only allow a single link between any two devices/ports.
Also prefer links with shorter names, and for links derived
using arp/mac, prioritise links with a matching ip address.
2016-06-05 21:45:46 +09:30
Tony Murray 9393c0e716 Fixes for the Avtech sensor state 2016-06-04 10:09:43 -05:00
Neil Lathwood 145ce879d5 Merge pull request #3600 from murrant/rrdcached
Alphabetize the apps list
2016-06-04 07:28:01 +01:00
Neil Lathwood cfdbc6f93d Merge pull request #3596 from murrant/ds-var-fix
Rename $ds to $ldap_connection
2016-06-04 07:23:59 +01:00
Tony Murray bf471698ef Change the rest of the $ds variables to $ldap_connection 2016-06-03 22:16:10 -05:00
Tony Murray fcd7ed6dda if -> elseif 2016-06-03 21:51:17 -05:00
Tony Murray f4cfd61aef Capitalize state descriptions 2016-06-03 21:48:24 -05:00
Tony Murray b54f449ed8 Add Avtech switch support 2016-06-03 21:44:21 -05:00
Tony Murray 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
Tony Murray 29c8f55580 Merge pull request #3598 from laf/issue-3584
Added detection for Samsung C series printers
2016-06-03 21:08:04 -05:00
Tony Murray a68687de5e Alphabetize the apps list 2016-06-03 21:05:09 -05:00
Brandon Boudrias 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
Neil Lathwood 2ebdb3c083 Update CentOS-image.md 2016-06-03 20:19:53 +01:00
Neil Lathwood 5117f5330a Update Ubuntu-image.md 2016-06-03 20:14:41 +01:00
Brandon Boudrias 3b4964e13c create common method for generating type_wheres 2016-06-03 10:42:16 -07:00
Brandon Boudrias 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
Tony Murray 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
Tony Murray af8cc3a24b SQL query on one line 2016-06-02 16:22:17 -05:00
Neil Lathwood 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
Neil Lathwood 003bfab0d3 Merge pull request #3588 from Rosiak/fix-typo-thing
Fix typo..
2016-06-02 22:17:06 +01:00
Neil Lathwood 3655051782 Merge pull request #3587 from Rosiak/buffalo-support
Basic Buffalo TeraStation Support
2016-06-02 22:16:46 +01:00
Neil Lathwood 167aabb9ff Merge pull request #3582 from geordish/move-os-logo
Moved image to correct location
2016-06-02 22:12:59 +01:00
Neil Lathwood 2d02d90eef Merge pull request #3580 from murrant/lsb-distro
Use lsb_release in the distro script
2016-06-02 22:12:47 +01:00
Tony Murray 009840bf8a Store device group relationships in a pivot table. 2016-06-02 13:25:01 -05:00
Søren Rosiak edd3d61fc8 Fix typo.. 2016-06-02 18:59:43 +02:00
Søren Rosiak df8514e143 Basic Buffalo TeraStation Support
#3492
2016-06-02 18:48:36 +02:00
Neil Lathwood 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
Dave Bell 77e76793c5 Moved image to correct location (Definition is ['os'][]['icon'] = 'microsemi';
)
2016-06-01 13:26:08 +01:00
Tony Murray 9aa4203cc3 Use lsb_release in the distro script.
Don't overwrite REV unless it is set properly by the lsb_release tool.
2016-06-01 01:00:04 -05:00
Tony Murray c7d551f6d1 Check that variables are set before using them.
This will hide ugly output for users not using a subdirectory, but may make it harder to diagnose issues for those that are.
2016-05-31 22:28:34 -05:00
Søren RosiakandTony Murray 16b91f6a97 Fix Smoking Path (#3577)
Fix Smokping Path
2016-05-31 21:24:03 -05:00
Søren Rosiak 38448e7c3c Basic HPE 3PAR Support
#3521
2016-05-31 21:59:54 +02:00
Robert Verspuy b6e76f911e Enabling "Random access" lookups for snmp_translate fixes the "MIB: Could not find all::enterprises.xxxx" error 2016-05-31 20:02:09 +02:00
Neil Lathwood 5d49f72d3e Merge pull request #3543 from Tatermen/master
Basic support for Xirrus Wireless Access Points.
2016-05-30 19:26:06 +01:00
Rick Hodger ddb04ad870 Added config option to includes/defaults.inc.php 2016-05-27 17:04:29 +01:00
Tony Murray a7408aea88 Spelling correction (#3569) 2016-05-27 10:44:29 -05:00
Tony Murray 1be894a920 Spelling correction 2016-05-27 10:43:27 -05:00
Tony Murray 18484db3fe Fix adding widgets (#3567) 2016-05-27 09:20:33 -05:00