mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clarify that you can use IP or hostname to add device (#11393)

Browse Source 
Remove overwrite IP when adding devices, it is very rare this should be used and the setting is misleading.
This commit is contained in:
Tony Murray
2020-04-09 16:39:37 -05:00
committed by GitHub
parent 961beb0e8b
commit 76e58b6cb2
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
addhost.php
View File

@ -217,13 +217,13 @@ if (!empty($argv[1])) {
c_echo(
"\n". Config::get('project_name').' Add Host Tool
Usage (SNMPv1/2c) : ./addhost.php [-g <poller group>] [-f] [-b] [-p <port assoc mode>] <%Whostname%n> [community] [v1|v2c] [port] [' . $transports_regex . ']
Usage (SNMPv1/2c) : ./addhost.php [-g <poller group>] [-f] [-b] [-p <port assoc mode>] <%Whostname or IP%n> [community] [v1|v2c] [port] [' . $transports_regex . ']
Usage (SNMPv3) :
Config Defaults : ./addhost.php [-g <poller group>] [-f] [-b] [-p <port assoc mode>] <%Whostname%n> any v3 [user] [port] [' . $transports_regex . ']
No Auth, No Priv : ./addhost.php [-g <poller group>] [-f] [-b] [-p <port assoc mode>] <%Whostname%n> nanp v3 [user] [port] [' . $transports_regex . ']
Auth, No Priv : ./addhost.php [-g <poller group>] [-f] [-b] [-p <port assoc mode>] <%Whostname%n> anp v3 <user> <password> [md5|sha] [port] [' . $transports_regex . ']
Auth, Priv : ./addhost.php [-g <poller group>] [-f] [-b] [-p <port assoc mode>] <%Whostname%n> ap v3 <user> <password> <enckey> [md5|sha] [aes|des] [port] [' . $transports_regex . ']
Usage (ICMP only) : ./addhost.php [-g <poller group>] [-f] -P <%Whostname%n> [os] [hardware]
Config Defaults : ./addhost.php [-g <poller group>] [-f] [-b] [-p <port assoc mode>] <%Whostname or IP%n> any v3 [user] [port] [' . $transports_regex . ']
No Auth, No Priv : ./addhost.php [-g <poller group>] [-f] [-b] [-p <port assoc mode>] <%Whostname or IP%n> nanp v3 [user] [port] [' . $transports_regex . ']
Auth, No Priv : ./addhost.php [-g <poller group>] [-f] [-b] [-p <port assoc mode>] <%Whostname or IP%n> anp v3 <user> <password> [md5|sha] [port] [' . $transports_regex . ']
Auth, Priv : ./addhost.php [-g <poller group>] [-f] [-b] [-p <port assoc mode>] <%Whostname or IP%n> ap v3 <user> <password> <enckey> [md5|sha] [aes|des] [port] [' . $transports_regex . ']
Usage (ICMP only) : ./addhost.php [-g <poller group>] [-f] -P <%Whostname or IP%n> [os] [hardware]
-g <poller group> allows you to add a device to be pinned to a specific poller when using distributed polling. X can be any number associated with a poller group
-f forces the device to be added by skipping the icmp and snmp check against the host.

10
includes/html/pages/addhost.inc.php
View File

@ -76,8 +76,6 @@ if (!empty($_POST['hostname'])) {
print_error('Unsupported SNMP Version. There was a dropdown menu, how did you reach this error ?');
}//end if
$additional['overwrite_ip'] = $_POST['overwrite_ip'];
$poller_group = clean($_POST['poller_group']);
$force_add = ($_POST['force_add'] == 'on');
@ -117,17 +115,11 @@ $pagetitle[] = 'Add host';
<div class="alert alert-info">Devices will be checked for Ping/SNMP reachability before being probed.</div>
<div class="well well-lg">
<div class="form-group">
<label for="hostname" class="col-sm-3 control-label">Hostname</label>
<label for="hostname" class="col-sm-3 control-label">Hostname or IP</label>
<div class="col-sm-9">
<input type="text" id="hostname" name="hostname" class="form-control input-sm" placeholder="Hostname">
</div>
</div>
<div class="form-group">
<label for="overwrite_ip" class="col-sm-3 control-label">Overwrite IP</label>
<div class="col-sm-9">
<input type="text" id="overwrite_ip" name="overwrite_ip" class="form-control input-sm" placeholder="Overwrite IP">
</div>
</div>
<div class='form-group'>
<label for='hardware' class='col-sm-3 control-label'>SNMP</label>
<div class='col-sm-4'>