Commit Graph

10917 Commits

Author SHA1 Message Date
Tony Murray
879abfb7e2 Merge pull request #3616 from keeperofdakeys/fan-sensor
Allow lmsensor fanspeeds of 0 to be discovered.
2016-06-10 11:19:53 -05:00
Tony Murray
8b9e68dcd9 Merge pull request #3617 from wiad/issue-3615
Test different hostname formats in Oxidized integration
2016-06-10 10:03:15 -05:00
Neil Lathwood
108d271cb5 Merge pull request #3630 from murrant/riverbed_icon
Update the Riverbed icon so it isn't stretched
2016-06-09 14:14:19 +01:00
Tony Murray
8a6d327b96 Update the Riverbed icon so it isn't stretched 2016-06-09 08:12:01 -05:00
Josh Driver
871f2d7ac6 I agree to the conditions of the Contributor Agreement contained
in doc/General/Contributing.md.
2016-06-09 21:03:51 +09:30
Adam Winberg
58c3f6e40f Merge branch 'master' of https://github.com:/wiad/librenms into issue-3615 2016-06-09 12:35:47 +02:00
Adam Winberg
6641bb17f5 Adhering to librenms style guidelines 2016-06-09 12:35:04 +02:00
Neil Lathwood
8b7cae21d3 Merge pull request #3628 from murrant/sort_defaults
Sort poller/discovery modules without affecting the $config order
2016-06-09 11:17:41 +01:00
Neil Lathwood
0b8d9d7a04 Merge pull request #3627 from murrant/rrdcached
Rrdcached application monitoring
2016-06-09 11:16:17 +01:00
Neil Lathwood
2cef85380a Merge pull request #3621 from ekoyle/alerts_table_add_location_on_hover
Add device hw/location on hover in alerts table
2016-06-09 11:13:56 +01:00
Neil Lathwood
69f37b365e Merge pull request #3602 from keeperofdakeys/master
Various Network Map Improvements
2016-06-09 11:06:56 +01:00
Adam Winberg
c97235ab82 Merge branch 'master' of https://github.com:/wiad/librenms into issue-3615 2016-06-09 08:50:53 +02:00
Adam Winberg
0ed7a51de3 adjust if statement syntax, as per suggestion from @murrant 2016-06-09 08:50:19 +02:00
Tony Murray
90749139f1 Merge pull request #3578 from Rosiak/hp3par-support
Basic HPE 3PAR Support
2016-06-09 00:48:48 -05:00
Tony Murray
6bd18f55f4 Merge pull request #3624 from Rosiak/hwg-ste
HWg Additions / Changes
2016-06-09 00:45:45 -05:00
Tony Murray
36818e7a52 Add graphs to graphs menu page.
Use rrd_name() function
Add copyright headers
2016-06-09 00:40:04 -05:00
Tony Murray
8d874e7220 Merge pull request #3625 from Rosiak/ibm-imm-support
Basic IBM IMM Support
2016-06-08 23:41:45 -05:00
Tony Murray
9f94b278d3 Sort poller/discovery modules without affecting the $config order 2016-06-08 23:29:33 -05:00
Tony Murray
2e23d14b98 Allow agent to enable apps in the $agentapps array 2016-06-08 21:42:18 -05:00
Tony Murray
5d9925a5a1 Tidy applications poller output 2016-06-08 21:13:01 -05:00
Tony Murray
60624c1ac0 Rrdcached application monitoring
Can collect data from the agent or by connecting directly
2016-06-08 20:48:53 -05:00
Tony Murray
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
Tony Murray
c3dfba4a20 Revert "Sort many items in defaults.inc.php" 2016-06-08 15:34:11 -05:00
Søren Rosiak
e9a06c07af Basic IBM IMM Support
#3622
2016-06-08 22:16:47 +02:00
Søren Rosiak
76920956a9 HWg Additions / Changes
#3606

And some changes to existing code.
2016-06-08 21:26:59 +02:00
Søren Rosiak
f50bfc9e97 Merge pull request #3612 from murrant/sort_defaults 2016-06-08 20:42:49 +02:00
Tony Murray
be18ad5dc1 Merge pull request #3619 from geordish/fix-config-markup
Fix Markup on config documentation page
2016-06-08 13:32:26 -05:00
Tony Murray
30428ae959 Merge pull request #3623 from Rosiak/ibm-bladecenter
Add IBM BladeCenter Switch Support
2016-06-08 13:31:40 -05:00
Søren Rosiak
9a8b133d8f Add IBM BladeCenter Switch Support
#3620
2016-06-08 20:26:28 +02:00
Eldon Koyle
809d281adf Add devicee hw/location on hover in alerts table
* Add devices.hardware and devices.location
* Remove some un-needed column aliases (col AS col is the default)
2016-06-08 10:10:34 -06:00
Dave Bell
c2bf94254d Fix Markup on config documentation page 2016-06-08 09:23:43 +01:00
Adam Winberg
88f5423aaf Test different hostname formats in Oxidized integration 2016-06-07 15:02:11 +02:00
Josh Driver
eba420a53a Allow lmsensor fanspeeds of 0 to be discovered. 2016-06-07 22:31:47 +09:30
Tony Murray
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
Neil Lathwood
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
Neil Lathwood
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
Neil Lathwood
5cb9d751c3 Revert "deduping type_where code, adding manual types to graph widgets " 2016-06-07 09:15:04 +01:00
Tony Murray
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
Tony Murray
db6ccf1404 Merge pull request #3611 from murrant/roomalert3e
Draw graphs for avtech switch state.
2016-06-06 19:18:51 -05:00
Tony Murray
b37d0f2e9e Draw graphs for avtech switch state. 2016-06-06 19:17:19 -05:00
Neil Lathwood
722df8da89 Merge pull request #3599 from murrant/roomalert3e
Roomalert3e
2016-06-06 21:47:04 +01:00
Tony Murray
ad8ecb0f82 Switch support for Avtech RoomAlert 4E 2016-06-06 15:44:55 -05:00
Tony Murray
807e3dfe61 Fix avtech switch type sensors 2016-06-06 15:33:41 -05:00
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
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
Dave Bell
e7c74d8bc5 Resolving issues on #3605 2016-06-06 15:09:31 +01: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