50 Commits

Author SHA1 Message Date
Tony Murray
8c639aa5a4 PSR2 Cleanup: /html edition
Travis tests for code conformance. Ignore warnings for now.
Fixed all errors, left most warnings.
2016-08-18 21:29:30 -05:00
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
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
vitalisator
6b583c447c fix maps 2016-03-05 15:32:59 +01:00
Jay McEntire
a77c9d234c Menu UI for map groups. 2016-03-03 16:43:13 -07:00
Jay McEntire
6866dfb176 Initial adds for map group functionality. 2016-02-16 17:14:58 -07:00
Eldon Koyle
9659bb322b Fix map bug caused by loopback cable
Fix a map bug where vis.js aborts because a device is inserted twice.
Need to add to $tmp_ids before checking the next device.
2015-12-02 17:07:32 -07:00
laf
87d273fc7d Removed / from link for installs not in / 2015-11-16 20:58:16 -08:00
Louis Rossouw
9fb2c0d674 Implement configurable network map parameters. 2015-07-29 01:17:08 +02:00
Daniel Preussker
b48e12a749 Merge pull request #1528 from laf/issue-1461
Updates to improve map quality
2015-07-24 10:16:56 +00:00
Neil Lathwood
cac95d3581 Merge pull request #1486 from spinza/fixzeromac
Ignore links based on 'unreal' mac addresses.
2015-07-19 22:03:08 +01:00
Louis Rossouw
b9cb02057a Ignore links based on 'unreal' mac adresses. 2015-07-19 22:54:16 +02:00
laf
59990d2258 Initialise arrays needed for merge 2015-07-19 21:45:56 +01:00
Neil Lathwood
e948db4e8c Revert "Ignore links based on 'unreal' mac addresses." 2015-07-19 22:04:18 +01:00
Louis Rossouw
00bbd02b1d Ignore links based on 'unreal' mac adresses. 2015-07-19 21:08:11 +02:00
laf
5d5d3b470d Updates to improve map quality 2015-07-19 17:59:08 +01:00
laf
9092f2729d Removed duplicate array 2015-07-18 17:18:31 +01:00
laf
c4dbe18437 Sorting duplicate links 2015-07-18 17:07:37 +01:00
laf
5633e6a005 Try and stop reverse links 2015-07-18 17:03:01 +01:00
laf
31f174c7b1 Docs + some variable changes 2015-07-18 16:15:57 +01:00
laf
87321516be Some small changes 2015-07-18 15:59:19 +01:00
laf
137fbf593c Updated physics and sql query 2015-07-18 15:48:07 +01:00
laf
4c39421787 Network map sql update + fix for duplicate links 2015-07-15 20:09:20 +01:00
Job Snijders
d8693f05ae Fix coding style part 2 2015-07-15 11:04:22 +02:00
laf
746f918a8a More map updates 2015-07-14 13:11:54 +01:00
laf
dfcf5c912a Updated where queries 2015-07-14 12:15:05 +01:00
laf
69c2b35212 Added restriction for device_id 2015-07-14 12:13:46 +01:00
laf
eb2f0d7a54 More network map updates 2015-07-14 11:47:42 +01:00
einhirn
94ea73a595 another minor correction about $port being undefined in some cases 2015-06-18 18:29:55 +02:00
einhirn
fdfe776c5a minor correction about being undefined in some cases 2015-06-18 16:57:36 +02:00
einhirn
653696b949 fixed a bug where stale link/device data would lead to broken map 2015-06-18 16:32:01 +02:00
laf
841cb803b3 Some tidying up of variables/array 2015-06-02 00:50:09 +01:00
laf
f0395e453e Final final updates to get better map support 2015-06-02 00:37:34 +01:00
Neil Lathwood
988cb3b240 Last update to get map working for mac addresses 2015-06-02 00:03:06 +01:00
laf
bdc4deb435 Updated to use mac address data 2015-06-01 23:27:41 +01:00
laf
b5fcc73ce6 Fixed map due to using jquery to resize 2015-05-03 22:39:25 +01:00
Rosiak
bedb546779 Added detection for window height for map page - Correction
Fixes issue #879
2015-04-29 22:59:30 +02:00
laf
b2cf6a815f Added detection for window height for map page 2015-04-29 18:22:04 +01:00
laf
2b744b81b1 Updated to use new overlib variable 2015-04-18 15:47:07 +01:00
laf
0da8a79a5f Fixed function calls 2015-04-17 20:42:28 +01:00
laf
31d3950dbf Changed node shape to be box 2015-04-17 20:22:57 +01:00
laf
5f076fe63e Updated query and color for 0% links 2015-04-17 20:15:31 +01:00
laf
d26e282834 Changed vis settings and added link utilisation 2015-04-17 19:56:46 +01:00
laf
c9f086484a Updated map to include graphs 2015-04-17 16:24:51 +01:00
laf
4873a83508 Added check for device_permitted to each device that is pulled out of the db 2015-04-11 10:17:27 +01:00
laf
bc285af35d Shorten interface names on map 2015-04-08 02:46:03 +01:00
laf
0da3cb8996 Fix for maps now working when devices hostname != the same in the links table 2015-03-29 02:11:55 +01:00
laf
374107b812 Final bits to the map
Conflicts:
	html/css/styles.css
	html/includes/print-map.inc.php
2015-03-28 14:02:00 +00:00
laf
60138aded5 Added webui files for new map pages 2015-03-28 13:59:23 +00:00