Merge branch 'master' into og-coreplugins

This commit is contained in:
Oliver Gorwits
2017-09-29 07:21:03 +01:00
7 changed files with 27 additions and 5 deletions

View File

@@ -124,9 +124,9 @@ host_groups:
- 'fe80::/10'
- '127.0.0.0/8'
device_identity: []
community: ['public']
community_rw: ['private']
device_auth: []
community: []
community_rw: []
snmp_auth: []
get_community: ""
bulkwalk_off: false
bulkwalk_no: []

View File

@@ -39,7 +39,7 @@
[% IF row.action == 'discover' AND row.status == 'error' %]
<a href="[% uri_for('/') %]?device=[% row.device | uri %]">[% row.device | html_entity %]</a>
[% ELSE %]
<a href="[% uri_for('/device') %]?q=[% row.device | uri %]">[% row.device | html_entity %]</a>
<a href="[% uri_for('/device') %]?q=[% row.device | uri %]">[% row.target.dns || row.device | html_entity %]</a>
[% END %]
</td>
<td class="nd_center-cell">[% row.port | html_entity %]</td>