Added ability to manually set ifSpeed

This commit is contained in:
laf 2016-06-30 09:49:30 +01:00
parent 0eb35c0c88
commit 6690e31f9d
4 changed files with 107 additions and 2 deletions

View File

@ -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';
}

View 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 = 999999;
$high_speed = 999999;
// 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 ($speed == '999999') {
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);

View File

@ -67,6 +67,46 @@
}
});
});
$(document).on('blur', "[name='if-speed']", function (){
var $this = $(this);
var speed = $this.val();
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');
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) {

View File

@ -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');