Commit Graph

2086 Commits

Author SHA1 Message Date
Tijmen de Mes fa94c8953c Fixed invalid query to get devices in networkmap when XDP is used. 2016-06-28 11:44:35 +02:00
pblasquez a3d2e1b439 Optimize map SQL
Changing LEFT joins to INNER joins brought a 70k result down from 4.1s to 1.7 in my testing.  The only benefit to LEFT joins is to retrieve rows with no match, but we filter those rows out in the WHERE clause.

Was able to map interconnections between 254 devices in 47s with both 'mac' and 'xdp' options turned on.
2016-06-23 22:45:41 -07:00
Tony Murray 53fa8d52a7 Merge pull request #3701 from geordish/correct-packets
Remove superfluous \ from port packets graph
2016-06-23 10:27:10 -05:00
Tony Murray d01804dc8a Merge pull request #3704 from laf/issue-3699
Fixed all maintenance windows appearing as having lapsed
2016-06-23 10:25:48 -05:00
Tony Murray 47afbd5701 Merge pull request #3697 from laf/issue-1911
Added ability to search graylog using the resolved IP we now store
2016-06-22 14:03:30 -05:00
laf 067f0f8d67 Updated if check for device ip 2016-06-22 19:39:47 +01:00
laf 423c24cf86 Fixed all maintenance windows appearing as having lapsed 2016-06-22 19:29:22 +01:00
Dave Bell 31ae6fb2e1 Made change consistent with rest of code, and fixed an additional problem 2016-06-22 14:51:08 +01:00
Dave Bell e3335fa57b Remove superfluous \ from port packets graph 2016-06-22 13:06:25 +01:00
Tony Murray 90565f739f Merge pull request #3692 from laf/issue-3105
Order alerts by state so that we can indicate rules which have triggered
2016-06-21 22:37:29 -05:00
laf 744e3d5d6f Added ability to search graylog using the resolved IP we now store 2016-06-21 20:45:03 +01:00
laf 06998420cf Updated unpolled notification to only show unpolled devices 2016-06-21 20:12:32 +01:00
laf 04778eadaa Order alerts by state so that we can indicate rules which have triggered 2016-06-20 23:23:17 +01:00
Neil Lathwood e07c935292 Merge pull request #3686 from gcoeugnet/master
Change severity color management
2016-06-20 14:21:43 +01:00
Guillaume COEUGNET 3b9d4bd0d3 Change severity color management 2016-06-20 14:45:10 +02:00
Daniel Preussker 91e37a6eb7 Merge pull request #3667 from laf/issue-3526
Un-acknowledging an alert will allow it to continue sending alerts
2016-06-16 05:30:22 +00:00
Neil Lathwood 3c45a96e3b Merge pull request #3661 from laf/issue-3657
Fixed ajax_* calls for use with base_url
2016-06-16 00:51:51 +01:00
laf 16155e2264 Un-acknowledging an alert will allow it to continue sending alerts 2016-06-16 00:50:22 +01:00
Lucas Rolff f5d9c5e48b Add In/Out to multiport graph
- Add In/Out text and color boxes to multiport bit graph
2016-06-15 15:20:19 +02:00
laf e3db9c8561 Fixed ajax_* calls for use with base_url 2016-06-15 12:58:23 +00:00
Dimitry 84b78fc6d2 Fixed spelling 2016-06-15 14:51:23 +02:00
Søren Rosiak 3d8e75a216 Merge pull request #3652 from laf/issue-3544 2016-06-14 19:01:28 +02:00
laf 1d678642b3 Updated docs and webui 2016-06-13 22:04:51 +00:00
laf ed0479a2f3 Fixed the create new alert template / edit template bug 2016-06-13 19:44:14 +00:00
Neil Lathwood dfcc740532 Merge pull request #3640 from tribut/image-keep-aspect
Keep aspect ratio for external images on dashboard
2016-06-12 19:38:08 +01:00
Neil Lathwood 2b47c927f9 Merge pull request #3568 from gcoeugnet/master
Add procedure management from alerting widget
2016-06-12 19:26:01 +01:00
Felix Eckhofer 82066f8430 Keep aspect ratio for external images on dashboard 2016-06-12 15:40:21 +02:00
Guillaume COEUGNET d705836c88 Change SQL file name and add /alerts support for procedure 2016-06-09 15:07:02 +02: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
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 60624c1ac0 Rrdcached application monitoring
Can collect data from the agent or by connecting directly
2016-06-08 20:48:53 -05: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
Neil Lathwood 5cb9d751c3 Revert "deduping type_where code, adding manual types to graph widgets " 2016-06-07 09:15:04 +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
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
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 bf471698ef Change the rest of the $ds variables to $ldap_connection 2016-06-03 22:16:10 -05:00
Brandon Boudrias 1aa7517372 giving graph widgets option to manually specify port type 2016-06-03 16:05:05 -07:00
Brandon Boudrias 3b4964e13c create common method for generating type_wheres 2016-06-03 10:42:16 -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 009840bf8a Store device group relationships in a pivot table. 2016-06-02 13:25:01 -05: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
Guillaume COEUGNET 88eb7c4c04 Change button name 2016-05-27 16:18:47 +02:00
Guillaume COEUGNET 8aacb68cb3 Correct useless change 2016-05-27 16:15:59 +02:00
Guillaume COEUGNET 4dadad944b Add procedure management 2016-05-27 16:13:51 +02:00
Guillaume COEUGNET d5e26a3438 Add procedure management 2016-05-27 16:11:06 +02:00