135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tune the portvlanmismatch and include domain name in report view

Browse Source
This commit is contained in:
Oliver Gorwits
2023-06-19 21:28:23 +01:00
parent f14e495e49
commit bb046f036e
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/App/Netdisco/DB/Result/Virtual/PortVLANMismatch.pm
View File

@@ -60,7 +60,7 @@ FROM (
ON dpv.ip = dp.ip AND dpv.port = dp.port ON dpv.ip = dp.ip AND dpv.port = dp.port
LEFT JOIN device_ip dip LEFT JOIN device_ip dip
ON dp.remote_ip = dip.alias ON dp.remote_ip = dip.alias AND (SELECT count(*) FROM device_ip WHERE alias = dp.remote_ip) = 1
UNION UNION
@@ -74,7 +74,7 @@ FROM (
ON dp3.ip = dpv2.ip AND dp3.port = dpv2.port ON dp3.ip = dpv2.ip AND dp3.port = dpv2.port
LEFT JOIN device_ip dip2 LEFT JOIN device_ip dip2
ON dp2.remote_ip = dip2.alias ON dp2.remote_ip = dip2.alias AND (SELECT count(*) FROM device_ip WHERE alias = dp2.remote_ip) = 1
) alldpv ) alldpv
WHERE vlan NOT IN ( ?, ?, ?, ? ) AND remote_ip IS NOT NULL WHERE vlan NOT IN ( ?, ?, ?, ? ) AND remote_ip IS NOT NULL

6
share/views/ajax/report/portvlanmismatch.tt
View File

@@ -20,8 +20,7 @@ $(document).ready(function() {
{ {
"data": 'left_ip', "data": 'left_ip',
"render": function(data, type, row, meta) { "render": function(data, type, row, meta) {
return '<a href="[% device_ports | none %]&q=' + encodeURIComponent(data) + '">' + he.encode(data || '') + '</a>' return '<a href="[% device_ports | none %]&q=' + encodeURIComponent(data) + '">' + he.encode(row.left_dns || data || '') + '</a>'; }
+ '<br />' + he.encode(row.left_dns || ''); }
}, { }, {
"data": 'left_port', "data": 'left_port',
"type": 'portsort', "type": 'portsort',
@@ -35,8 +34,7 @@ $(document).ready(function() {
}, { }, {
"data": 'right_ip', "data": 'right_ip',
"render": function(data, type, row, meta) { "render": function(data, type, row, meta) {
return '<a href="[% device_ports | none %]&q=' + encodeURIComponent(data) + '">' + he.encode(data || '') + '</a>' return '<a href="[% device_ports | none %]&q=' + encodeURIComponent(data) + '">' + he.encode(row.right_dns || data || '') + '</a>'; }
+ '<br />' + he.encode(row.right_dns || ''); }
}, { }, {
"data": 'right_port', "data": 'right_port',
"type": 'portsort', "type": 'portsort',