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

Show sensors warnings values + moved to json and toastr (#9210)

Browse Source 
DO NOT DELETE THIS TEXT

#### Please note

> Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting.

- [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/)

#### Testers

If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926`
This commit is contained in:
TheGreatDoc
2018-09-16 18:23:12 +01:00
committed by Neil Lathwood
co-authored by Neil Lathwood
parent 57b16c77bf
commit cf31776a6b
4 changed files with 153 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/forms/sensor-alert-reset.inc.php
+35 -15
View File
@@ -4,6 +4,7 @@
* LibreNMS
*
* Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk>
* Copyright (c) 2018 TheGreatDoc <https://github.com/TheGreatDoc>
*
* 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
@@ -14,23 +15,42 @@
use LibreNMS\Authentication\LegacyAuth;
header('Content-type: text/plain');
// FUA
header('Content-type: application/json');
if (!LegacyAuth::user()->hasGlobalAdmin()) {
die('ERROR: You need to be admin');
$response = array(
'status' => 'error',
'message' => 'Need to be admin',
);
echo _json_encode($response);
exit;
}
for ($x = 0; $x < count($_POST['sensor_id']); $x++) {
dbUpdate(
array(
'sensor_limit' => set_null($_POST['sensor_limit'][$x], array('NULL')),
'sensor_limit_low' => set_null($_POST['sensor_limit_low'][$x], array('NULL')),
'sensor_alert' => set_null($_POST['sensor_alert'][$x], array('NULL'))
),
'sensors',
'`sensor_id` = ?',
array($_POST['sensor_id'][$x])
);
$status = 'error';
$message = 'Error resetting values';
$sensor_limit = $_POST['sensor_limit'];
$sensor_limit_warn = $_POST['sensor_limit_warn'];
$sensor_limit_low = $_POST['sensor_limit_low'];
$sensor_limit_low_warn = $_POST['sensor_limit_low_warn'];
$sensor_alert = $_POST['sensor_alert'];
$sensor_id = $_POST['sensor_id'];
$sensor_count = count($sensor_id);
if (is_array($sensor_id)) {
for ($x = 0; $x < $sensor_count; $x++) {
if (dbUpdate(array('sensor_limit' => set_null($sensor_limit[$x], array('NULL')), 'sensor_limit_warn' => set_null($sensor_limit_warn[$x], array('NULL')), 'sensor_limit_low_warn' => set_null($sensor_limit_low_warn[$x], array('NULL')), 'sensor_limit_low' => set_null($sensor_limit_low[$x], array('NULL'))), 'sensors', '`sensor_id` = ?', array($sensor_id[$x])) >= 0) {
$message = 'Sensor values resetted';
$status = 'ok';
} else {
$message = 'Could not reset sensors values';
}
}
} else {
$status = 'error';
$message = 'Invalid sensor id';
}
$response = array(
'status' => $status,
'message' => $message
);
echo _json_encode($response);
html/includes/forms/sensor-alert-update.inc.php
+30 -14
View File
@@ -4,6 +4,7 @@
* LibreNMS
*
* Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk>
* Copyright (c) 2018 TheGreatDoc <https://github.com/TheGreatDoc>
*
* 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
@@ -14,36 +15,51 @@
use LibreNMS\Authentication\LegacyAuth;
header('Content-type: text/plain');
// FUA
header('Content-type: application/json');
if (!LegacyAuth::user()->hasGlobalAdmin()) {
die('ERROR: You need to be admin');
$response = array(
'status' => 'error',
'message' => 'Need to be admin',
);
echo _json_encode($response);
exit;
}
if (isset($_POST['sub_type']) && !empty($_POST['sub_type'])) {
dbUpdate(array('sensor_custom' => 'No'), 'sensors', '`sensor_id` = ?', array($_POST['sensor_id']));
$status = 'error';
$message = 'Error removing custom';
if (dbUpdate(array('sensor_custom' => 'No'), 'sensors', '`sensor_id` = ?', array($_POST['sensor_id'])) >= 0) {
$status = 'ok';
$message = 'Custom limit removed. New one will be set up in rediscovery';
} else {
$message = 'Couldn\'t not remove custom. Enable debug and check logfile';
}
} else {
if (!is_numeric($_POST['device_id']) || !is_numeric($_POST['sensor_id'])) {
echo 'error with data';
exit;
$message = "Invalid device or sensor id";
} else {
if ($_POST['state'] == 'true') {
$state = 1;
$state_string = "enabled";
} elseif ($_POST['state'] == 'false') {
$state = 0;
$state_string = "disabled";
} else {
$state = 0;
$state_string = "disabled";
}
$update = dbUpdate(array('sensor_alert' => $state), 'sensors', '`sensor_id` = ? AND `device_id` = ?', array($_POST['sensor_id'], $_POST['device_id']));
if (!empty($update) || $update == '0') {
echo 'success';
exit;
if (dbUpdate(array('sensor_alert' => $state), 'sensors', '`sensor_id` = ? AND `device_id` = ?', array($_POST['sensor_id'], $_POST['device_id'])) >= 0) {
$status = ($state == 0) ? 'info' : 'ok';
$message = 'Alerts ' . $state_string . ' for sensor ' . $_POST['sensor_desc'];
} else {
echo 'error';
exit;
$status = 'error';
$message = 'Couldn\'t ' . substr($state_string, 0, -1) . ' alerts for sensor ' . $_POST['sensor_desc'] . '. Enable debug and check librenms.log';
}
}
}
$response = array(
'status' => $status,
'message' => $message
);
echo _json_encode($response);
html/includes/forms/sensor-update.inc.php
+31 -18
View File
@@ -4,6 +4,7 @@
* LibreNMS
*
* Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk>
* Copyright (c) 2018 TheGreatDoc <https://github.com/TheGreatDoc>
*
* 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
@@ -14,29 +15,41 @@
use LibreNMS\Authentication\LegacyAuth;
header('Content-type: text/plain');
// FUA
header('Content-type: application/json');
if (!LegacyAuth::user()->hasGlobalAdmin()) {
die('ERROR: You need to be admin');
$response = array(
'status' => 'error',
'message' => 'Need to be admin',
);
echo _json_encode($response);
exit;
}
if (!is_numeric($_POST['device_id']) || !is_numeric($_POST['sensor_id']) || !isset($_POST['data'])) {
echo 'error with data';
exit;
$status = 'error';
$message = 'Error updating sensor limit';
$device_id = $_POST['device_id'];
$sensor_id = $_POST['sensor_id'];
$value_type = $_POST['value_type'];
$data = $_POST['data'];
if (!is_numeric($device_id)) {
$message = 'Missing device id';
} elseif (!is_numeric($sensor_id)) {
$message = 'Missing sensor id';
} elseif (!isset($data)) {
$message = 'Missing data';
} else {
$update = dbUpdate(
array($_POST['value_type'] => set_null($_POST['data'], array('NULL')), 'sensor_custom' => 'Yes'),
'sensors',
'`sensor_id` = ? AND `device_id` = ?',
array($_POST['sensor_id'], $_POST['device_id'])
);
if (!empty($update) || $update == '0') {
echo 'success';
exit;
if (dbUpdate(array($value_type => set_null($data, array('NULL')), 'sensor_custom' => 'Yes'), 'sensors', '`sensor_id` = ? AND `device_id` = ?', array($sensor_id, $device_id)) >= 0) {
$message = 'Sensor value updated';
$status = 'ok';
} else {
echo 'error';
exit;
$message = 'Could not update sensor value';
}
}
$response = array(
'status' => $status,
'message' => $message,
);
echo _json_encode($response);
html/pages/device/edit/sensors-common.php
+57 -33
View File
@@ -5,6 +5,7 @@
*
* Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk>
* Copyright (c) 2017 Tony Murray <https://github.com/murrant>
* Copyright (c) 2018 TheGreatDoc <https://github.com/TheGreatDoc>
*
* 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
@@ -25,6 +26,8 @@ echo "<h3>$title</h3>";
<th>Desc</th>
<th>Current</th>
<th class="col-sm-1">High</th>
<th class="col-sm-1">High warn</th>
<th class="col-sm-1">Low warn</th>
<th class="col-sm-1">Low</th>
<th class="col-sm-2">Alerts</th>
<th></th>
@@ -35,6 +38,8 @@ foreach (dbFetchRows("SELECT * FROM `$table` WHERE `device_id` = ? AND `sensor_d
$rollback[] = array(
'sensor_id' => $sensor['sensor_id'],
'sensor_limit' => $sensor['sensor_limit'],
'sensor_limit_warn' => $sensor['sensor_limit_warn'],
'sensor_limit_low_warn' => $sensor['sensor_limit_low_warn'],
'sensor_limit_low' => $sensor['sensor_limit_low'],
'sensor_alert' => $sensor['sensor_alert'],
);
@@ -59,21 +64,25 @@ foreach (dbFetchRows("SELECT * FROM `$table` WHERE `device_id` = ? AND `sensor_d
<td>
<div class="form-group has-feedback">
<input type="text" class="form-control input-sm sensor" id="high-'.$sensor['device_id'].'" data-device_id="'.$sensor['device_id'].'" data-value_type="sensor_limit" data-sensor_id="'.$sensor['sensor_id'].'" value="'.$sensor['sensor_limit'].'">
<span class="form-control-feedback">
<i class="fa" aria-hidden="true"></i>
</span>
</div>
</td>
<td>
<div class="form-group has-feedback">
<input type="text" class="form-control input-sm sensor" id="high-'.$sensor['device_id'].'-warn" data-device_id="'.$sensor['device_id'].'" data-value_type="sensor_limit_warn" data-sensor_id="'.$sensor['sensor_id'].'" value="'.$sensor['sensor_limit_warn'].'">
</div>
</td>
<td>
<div class="form-group has-feedback">
<input type="text" class="form-control input-sm sensor" id="low-'.$sensor['device_id'].'-warn" data-device_id="'.$sensor['device_id'].'" data-value_type="sensor_limit_low_warn" data-sensor_id="'.$sensor['sensor_id'].'" value="'.$sensor['sensor_limit_low_warn'].'">
</div>
</td>
<td>
<div class="form-group has-feedback">
<input type="text" class="form-control input-sm sensor" id="low-'.$sensor['device_id'].'" data-device_id="'.$sensor['device_id'].'" data-value_type="sensor_limit_low" data-sensor_id="'.$sensor['sensor_id'].'" value="'.$sensor['sensor_limit_low'].'">
<span class="form-control-feedback">
<i class="fa" aria-hidden="true"></i>
</span>
</div>
</td>
<td>
<input type="checkbox" name="alert-status" data-device_id="'.$sensor['device_id'].'" data-sensor_id="'.$sensor['sensor_id'].'" '.$alert_status.'>
<input type="checkbox" name="alert-status" data-device_id="'.$sensor['device_id'].'" data-sensor_id="'.$sensor['sensor_id'].'" data-sensor_desc="'.$sensor['sensor_descr'].'" '.$alert_status.'>
</td>
<td>
<a type="button" class="btn btn-danger btn-sm '.$custom.' remove-custom" id="remove-custom" name="remove-custom" data-sensor_id="'.$sensor['sensor_id'].'">Clear custom</a>
@@ -90,6 +99,8 @@ foreach ($rollback as $reset_data) {
echo '
<input type="hidden" name="sensor_id[]" value="'.$reset_data['sensor_id'].'">
<input type="hidden" name="sensor_limit[]" value="'.$reset_data['sensor_limit'].'">
<input type="hidden" name="sensor_limit_warn[]" value="'.$reset_data['sensor_limit_warn'].'">
<input type="hidden" name="sensor_limit_low_warn[]" value="'.$reset_data['sensor_limit_low_warn'].'">
<input type="hidden" name="sensor_limit_low[]" value="'.$reset_data['sensor_limit_low'].'">
<input type="hidden" name="sensor_alert[]" value="'.$reset_data['sensor_alert'].'">
';
@@ -101,18 +112,27 @@ foreach ($rollback as $reset_data) {
<script>
$('#newThread').on('click', function(e){
e.preventDefault(); // preventing default click action
var form = $('#alert-reset');
$.ajax({
type: 'POST',
url: 'ajax_form.php',
data: form.serialize(),
dataType: "html",
dataType: "json",
success: function(data){
//alert(data);
location.reload(true);
if (data.status == 'ok') {
toastr.success(data.message);
setTimeout(function() {
location.reload(true);
}, 2000);
} else {
toastr.error(data.message);
}
},
error:function(){
//alert('bad');
toastr.error(data.message);
}
});
});
@@ -139,25 +159,19 @@ $( ".sensor" ).bind('blur keyup',function(e) {
type: 'POST',
url: 'ajax_form.php',
data: { type: "<?php echo $ajax_prefix; ?>-update", device_id: device_id, data: data, sensor_id: sensor_id , value_type: value_type},
dataType: "html",
dataType: "json",
success: function(data){
$this.closest('.form-group').addClass('has-success');
$this.next().find('.fa').addClass('fa-check');
$this.data('val', $this.val());
if (data.status == 'ok') {
$('.remove-custom[data-sensor_id='+sensor_id+']').removeClass('disabled');
setTimeout(function(){
$this.closest('.form-group').removeClass('has-success');
$this.next().find('.fa').removeClass('fa-check');
}, 2000);
toastr.success(data.message);
} else {
toastr.error(data.message);
}
},
error:function(){
$this.closest('.form-group').addClass('has-error');
$this.next().find('.fa').addClass('fa-times');
setTimeout(function(){
$this.closest('.form-group').removeClass('has-error');
$this.next().find('.fa').removeClass('fa-times');
}, 2000);
}
error:function(){
toastr.error(data.message);
}
});
});
@@ -167,16 +181,25 @@ $('input[name="alert-status"]').on('switchChange.bootstrapSwitch', function(eve
var $this = $(this);
var device_id = $(this).data("device_id");
var sensor_id = $(this).data("sensor_id");
var sensor_desc = $(this).data("sensor_desc");
$.ajax({
type: 'POST',
url: 'ajax_form.php',
data: { type: "<?php echo $ajax_prefix; ?>-alert-update", device_id: device_id, sensor_id: sensor_id, state: state},
dataType: "html",
data: { type: "<?php echo $ajax_prefix; ?>-alert-update", device_id: device_id, sensor_id: sensor_id, sensor_desc: sensor_desc, state: state},
dataType: "json",
success: function(data){
//alert('good');
if (data.status != 'error') {
if (data.status == 'ok') {
toastr.success(data.message);
} else {
toastr.info(data.message);
}
} else {
toastr.error(data.message);
}
},
error:function(){
//alert('bad');
toastr.error(data.message);
}
});
});
@@ -188,12 +211,13 @@ $("[name='remove-custom']").on('click', function(event) {
type: 'POST',
url: 'ajax_form.php',
data: { type: "<?php echo $ajax_prefix; ?>-alert-update", sensor_id: sensor_id, sub_type: "remove-custom" },
dataType: "html",
dataType: "json",
success: function(data){
toastr.success(data.message);
$this.addClass('disabled');
},
error:function(){
//alert('bad');
toastr.error(data.message);
}
});
});