mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
Merge pull request #3752 from laf/ifSpeed
Added ability to override the ifSpeed values of a port
This commit is contained in:
Tony Murray
GitHub
@@ -20,8 +20,6 @@ $device_id = mres($_POST['device_id']);
|
||||
$ifName = mres($_POST['ifName']);
|
||||
$port_id = mres($_POST['port_id']);
|
||||
|
||||
logfile($descr . ','. $device_id . ','. $ifName. ','. $port_id);
|
||||
|
||||
if (!empty($ifName) && is_numeric($port_id)) {
|
||||
// We have ifName and port id so update ifAlias
|
||||
if (empty($descr)) {
|
||||
@@ -32,9 +30,11 @@ if (!empty($ifName) && is_numeric($port_id)) {
|
||||
$device = device_by_id_cache($device_id);
|
||||
if ($descr === 'repoll') {
|
||||
del_dev_attrib($device, 'ifName:'.$ifName);
|
||||
log_event("$ifName Port ifAlias cleared manually", $device, 'interface', $port_id);
|
||||
}
|
||||
else {
|
||||
set_dev_attrib($device, 'ifName:'.$ifName, 1);
|
||||
log_event("$ifName Port ifAlias set manually: $descr", $device, 'interface', $port_id);
|
||||
}
|
||||
$status = 'ok';
|
||||
}
|
||||
|
||||
60
html/includes/forms/update-ifspeed.inc.php
Normal file
60
html/includes/forms/update-ifspeed.inc.php
Normal file
@@ -0,0 +1,60 @@
|
||||
<?php
|
||||
/*
|
||||
* LibreNMS
|
||||
*
|
||||
* Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk/fa>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation, either version 3 of the License, or (at your
|
||||
* option) any later version. Please see LICENSE.txt at the top level of
|
||||
* the source code distribution for details.
|
||||
*/
|
||||
header('Content-type: application/json');
|
||||
|
||||
$status = 'error';
|
||||
|
||||
$speed = mres($_POST['speed']);
|
||||
$device_id = mres($_POST['device_id']);
|
||||
$ifName = mres($_POST['ifName']);
|
||||
$port_id = mres($_POST['port_id']);
|
||||
|
||||
if (!empty($ifName) && is_numeric($port_id) && is_numeric($port_id)) {
|
||||
// We have ifName and port id so update ifAlias
|
||||
if (empty($speed)) {
|
||||
$speed = array('NULL');
|
||||
$high_speed = array('NULL');
|
||||
// Set to 999999 so we avoid using ifDescr on port poll
|
||||
}
|
||||
else {
|
||||
$high_speed = $speed / 1000000;
|
||||
}
|
||||
if (dbUpdate(array('ifSpeed'=>$speed, 'ifHighSpeed'=>$high_speed), 'ports', '`port_id`=?', array($port_id)) > 0) {
|
||||
$device = device_by_id_cache($device_id);
|
||||
if (is_array($speed)) {
|
||||
del_dev_attrib($device, 'ifSpeed:'.$ifName);
|
||||
log_event("$ifName Port speed cleared manually", $device, 'interface', $port_id);
|
||||
}
|
||||
else {
|
||||
set_dev_attrib($device, 'ifSpeed:'.$ifName, 1);
|
||||
log_event("$ifName Port speed set manually: $speed", $device, 'interface', $port_id);
|
||||
$port_tune = get_dev_attrib($device, 'ifName_tune:'.$ifName);
|
||||
$device_tune = get_dev_attrib($device,'override_rrdtool_tune');
|
||||
if ($port_tune == "true" ||
|
||||
($device_tune == "true" && $port_tune != 'false') ||
|
||||
($config['rrdtool_tune'] == "true" && $port_tune != 'false' && $device_tune != 'false')) {
|
||||
$rrdfile = get_port_rrdfile_path ($device['hostname'], $port_id);
|
||||
rrdtool_tune('port',$rrdfile,$speed);
|
||||
}
|
||||
}
|
||||
$status = 'ok';
|
||||
}
|
||||
else {
|
||||
$status = 'na';
|
||||
}
|
||||
}
|
||||
|
||||
$response = array(
|
||||
'status' => $status,
|
||||
);
|
||||
echo _json_encode($response);
|
||||
@@ -71,6 +71,7 @@ foreach (dbFetchRows($sql, $param) as $port) {
|
||||
<input type="hidden" name="oldign_'.$port['port_id'].'" value="'.($port['ignore'] ? 1 : 0).'"">',
|
||||
'port_tune' => '<input type="checkbox" id="override_config" name="override_config" data-attrib="ifName_tune:'.$port['ifName'].'" data-device_id="'.$port['device_id'].'" data-size="small" '.$checked.'>',
|
||||
'ifAlias' => '<div class="form-group"><input class="form-control input-sm" id="if-alias" name="if-alias" data-device_id="'.$port['device_id'].'" data-port_id="'.$port['port_id'].'" data-ifName="'.$port['ifName'].'" value="'.$port['ifAlias'].'"><span class="glyphicon form-control-feedback" aria-hidden="true"></span></div>',
|
||||
'ifSpeed' => '<div class="form-group has-feedback"><input type="text" pattern="[0-9]*" inputmode="numeric" class="form-control input-sm" id="if-speed" name="if-speed" data-device_id="'.$port['device_id'].'" data-port_id="'.$port['port_id'].'" data-ifName="'.$port['ifName'].'" value="'.$port['ifSpeed'].'"><span class="glyphicon form-control-feedback" aria-hidden="true"></span></div>',
|
||||
);
|
||||
|
||||
}//end foreach
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
<th data-column-id='ifOperStatus'>Oper</th>
|
||||
<th data-column-id='disabled' data-sortable='false'>Disable</th>
|
||||
<th data-column-id='ignore' data-sortable='false'>Ignore</th>
|
||||
<th data-column-id='ifSpeed'>ifSpeed (bits/s)</th>
|
||||
<th data-column-id='port_tune' data-sortable='false' data-searchable='false'>RRD Tune</th>
|
||||
<th data-column-id='ifAlias'>Description</th>
|
||||
</tr>
|
||||
@@ -66,6 +67,48 @@
|
||||
}
|
||||
});
|
||||
});
|
||||
$(document).on('blur keyup', "[name='if-speed']", function (e){
|
||||
if (e.type === 'keyup' && e.keyCode !== 13) return;
|
||||
var $this = $(this);
|
||||
var speed = $this.val().replace(/[^0-9]/gi, '');
|
||||
var device_id = $this.data('device_id');
|
||||
var port_id = $this.data('port_id');
|
||||
var ifName = $this.data('ifname');
|
||||
$.ajax({
|
||||
type: 'POST',
|
||||
url: 'ajax_form.php',
|
||||
data: {type: "update-ifspeed", speed: speed, ifName: ifName, port_id: port_id, device_id: device_id},
|
||||
dataType: "json",
|
||||
success: function (data) {
|
||||
if (data.status == 'ok') {
|
||||
$this.closest('.form-group').addClass('has-success');
|
||||
$this.next().addClass('glyphicon-ok');
|
||||
$this.val(speed);
|
||||
setTimeout(function(){
|
||||
$this.closest('.form-group').removeClass('has-success');
|
||||
$this.next().removeClass('glyphicon-ok');
|
||||
}, 2000);
|
||||
} else if (data.status == 'na') {
|
||||
|
||||
} else {
|
||||
$(this).closest('.form-group').addClass('has-error');
|
||||
$this.next().addClass('glyphicon-remove');
|
||||
setTimeout(function(){
|
||||
$this.closest('.form-group').removeClass('has-error');
|
||||
$this.next().removeClass('glyphicon-remove');
|
||||
}, 2000);
|
||||
}
|
||||
},
|
||||
error: function () {
|
||||
$(this).closest('.form-group').addClass('has-error');
|
||||
$this.next().addClass('glyphicon-remove');
|
||||
setTimeout(function(){
|
||||
$this.closest('.form-group').removeClass('has-error');
|
||||
$this.next().removeClass('glyphicon-remove');
|
||||
}, 2000);
|
||||
}
|
||||
});
|
||||
});
|
||||
$(document).ready(function() {
|
||||
$('form#ignoreport').submit(function (event) {
|
||||
$('#disable-toggle').click(function (event) {
|
||||
|
||||
@@ -444,6 +444,11 @@ foreach ($ports as $port) {
|
||||
$this_port['ifAlias'] = $port['ifAlias'];
|
||||
}
|
||||
}
|
||||
if ($oid == 'ifSpeed' || $oid == 'ifHighSpeed') {
|
||||
if (get_dev_attrib($device, 'ifSpeed:'.$port['ifName'], 1)) {
|
||||
$this_port[$oid] = $port[$oid];
|
||||
}
|
||||
}
|
||||
|
||||
if ($port[$oid] != $this_port[$oid] && !isset($this_port[$oid])) {
|
||||
$port['update'][$oid] = array('NULL');
|
||||
|
||||
Reference in New Issue
Block a user