- added rrd_pipes to check script

- renamed service_* to *_service
This commit is contained in:
Aaron Daniels
2016-03-22 16:40:51 +10:00
parent 870d3aee56
commit 854812a457
10 changed files with 51 additions and 40 deletions
+2 -2
View File
@@ -26,7 +26,7 @@ $device_id = mres($vars['device_id']);
if (is_numeric($service_id) && $service_id > 0) {
// Need to edit.
$update = array('service_desc' => $desc, 'service_ip' => $ip, 'service_param' => $param);
if (service_edit($update, $service_id)) {
if (edit_service($update, $service_id)) {
$status = array('status' =>0, 'message' => 'Modified Service: <i>'.$service_id.': '.$type.'</i>');
}
else {
@@ -35,7 +35,7 @@ if (is_numeric($service_id) && $service_id > 0) {
}
else {
// Need to add.
$service_id = service_add($device_id, $type, $desc, $ip, $param);
$service_id = add_service($device_id, $type, $desc, $ip, $param);
if ($service_id == false) {
$status = array('status' =>1, 'message' => 'ERROR: Failed to add Service: <i>'.$type.'</i>');
}
+1 -1
View File
@@ -19,7 +19,7 @@ else {
$status = array('status' =>1, 'message' => 'No Service has been selected');
}
else {
if (service_delete($vars['service_id'])) {
if (delete_service($vars['service_id'])) {
$status = array('status' =>0, 'message' => 'Service: <i>'.$vars['service_id'].', has been deleted.</i>');
}
else {
+1 -1
View File
@@ -3,7 +3,7 @@ require $config['install_dir'].'/includes/object-cache.inc.php';
// FIXME - this could do with some performance improvements, i think. possible rearranging some tables and setting flags at poller time (nothing changes outside of then anyways)
$service_status = service_status();
$service_status = get_service_status();
$if_alerts = dbFetchCell("SELECT COUNT(port_id) FROM `ports` WHERE `ifOperStatus` = 'down' AND `ifAdminStatus` = 'up' AND `ignore` = '0'");
if ($_SESSION['userlevel'] >= 5) {