use remote_is_discoverable instead of local netdisco config
This commit is contained in:
@@ -19,9 +19,6 @@ set('connected_properties' => [
|
|||||||
hook 'before_template' => sub {
|
hook 'before_template' => sub {
|
||||||
my $tokens = shift;
|
my $tokens = shift;
|
||||||
|
|
||||||
# allow checking of discoverability of remote connected device
|
|
||||||
$tokens->{has_snmp} = sub { not match_to_setting(shift, 'discover_no_type') };
|
|
||||||
|
|
||||||
my $defaults = var('sidebar_defaults')->{'device_ports'}
|
my $defaults = var('sidebar_defaults')->{'device_ports'}
|
||||||
or return;
|
or return;
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,11 @@ register_admin_task(
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
# just to note a problem with this query:
|
||||||
|
# using DeviceSkip to see if discover is blocked, but that table only shows
|
||||||
|
# blocked actions on backends not permitted, so there may be a backend running
|
||||||
|
# that permits the action, we would not know.
|
||||||
|
|
||||||
get '/ajax/content/admin/undiscoveredneighbors' => require_role admin => sub {
|
get '/ajax/content/admin/undiscoveredneighbors' => require_role admin => sub {
|
||||||
my @results
|
my @results
|
||||||
= schema('netdisco')->resultset('Virtual::UndiscoveredNeighbors')->hri->all;
|
= schema('netdisco')->resultset('Virtual::UndiscoveredNeighbors')->hri->all;
|
||||||
|
|||||||
@@ -294,7 +294,7 @@
|
|||||||
[% END %]
|
[% END %]
|
||||||
<a href="[% device_ports | none %]&q=[% row.get_column('neighbor_ip') | uri %]">
|
<a href="[% device_ports | none %]&q=[% row.get_column('neighbor_ip') | uri %]">
|
||||||
[% row.get_column('neighbor_dns').remove(settings.domain_suffix) || row.get_column('neighbor_ip') | html_entity %]</a>
|
[% row.get_column('neighbor_dns').remove(settings.domain_suffix) || row.get_column('neighbor_ip') | html_entity %]</a>
|
||||||
[% IF row.remote_port and has_snmp(row.remote_type) %]
|
[% IF row.remote_port and row.remote_is_discoverable %]
|
||||||
-
|
-
|
||||||
<a href="[% device_ports | none %]&q=[% row.get_column('neighbor_ip') | uri %]&f=[% row.remote_port | uri %]&prefer=port">
|
<a href="[% device_ports | none %]&q=[% row.get_column('neighbor_ip') | uri %]&f=[% row.remote_port | uri %]&prefer=port">
|
||||||
[% row.remote_port | html_entity %]</a>
|
[% row.remote_port | html_entity %]</a>
|
||||||
@@ -308,7 +308,7 @@
|
|||||||
[% ' type: '_ row.remote_type IF row.remote_type %])<br/>
|
[% ' type: '_ row.remote_type IF row.remote_type %])<br/>
|
||||||
[% END %]
|
[% END %]
|
||||||
[% ELSIF row.remote_ip %]
|
[% ELSIF row.remote_ip %]
|
||||||
[% '<i class="icon-unlink text-error"></i> ' IF has_snmp(row.remote_type) %]
|
[% '<i class="icon-unlink text-error"></i> ' IF row.remote_is_discoverable %]
|
||||||
[% IF row.remote_is_phone %]
|
[% IF row.remote_is_phone %]
|
||||||
<i class="icon-phone"></i>
|
<i class="icon-phone"></i>
|
||||||
[% ELSIF row.remote_is_wap %]
|
[% ELSIF row.remote_is_wap %]
|
||||||
@@ -316,7 +316,7 @@
|
|||||||
[% END %]
|
[% END %]
|
||||||
<a href="[% search_node | none %]&q=[% row.remote_ip | uri %]">
|
<a href="[% search_node | none %]&q=[% row.remote_ip | uri %]">
|
||||||
[% row.remote_ip | html_entity %]
|
[% row.remote_ip | html_entity %]
|
||||||
[% IF row.remote_port and has_snmp(row.remote_type) %]
|
[% IF row.remote_port and row.remote_is_discoverable %]
|
||||||
- [% row.remote_port | html_entity %]
|
- [% row.remote_port | html_entity %]
|
||||||
[% END %]
|
[% END %]
|
||||||
</a><br/>
|
</a><br/>
|
||||||
@@ -328,7 +328,7 @@
|
|||||||
[% ' type: '_ row.remote_type IF row.remote_type %])<br/>
|
[% ' type: '_ row.remote_type IF row.remote_type %])<br/>
|
||||||
[% END %]
|
[% END %]
|
||||||
[% ELSE %]
|
[% ELSE %]
|
||||||
[% '<i class="icon-unlink text-error"></i> (possible uplink)' IF has_snmp(row.remote_type) %]
|
[% '<i class="icon-unlink text-error"></i> (possible uplink)' IF row.remote_is_discoverable %]
|
||||||
[% END %]
|
[% END %]
|
||||||
[% END %]
|
[% END %]
|
||||||
[% IF params.c_nodes %]
|
[% IF params.c_nodes %]
|
||||||
|
|||||||
Reference in New Issue
Block a user