From 854812a4577b7c9220be8de84d587fff7bbd83f5 Mon Sep 17 00:00:00 2001 From: Aaron Daniels Date: Tue, 22 Mar 2016 07:35:39 +1000 Subject: [PATCH] - added rrd_pipes to check script - renamed service_* to *_service --- check-services.php | 6 ++- html/includes/forms/create-service.inc.php | 4 +- html/includes/forms/delete-service.inc.php | 2 +- html/includes/print-menubar.php | 2 +- html/pages/addsrv.inc.php | 2 +- html/pages/device/edit/services.inc.php | 2 +- html/pages/device/overview.inc.php | 2 +- html/pages/services.inc.php | 45 +++++++++++++--------- includes/discovery/services.inc.php | 2 +- includes/services.inc.php | 24 ++++++------ 10 files changed, 51 insertions(+), 40 deletions(-) diff --git a/check-services.php b/check-services.php index 9932151ea..dcee38ae8 100755 --- a/check-services.php +++ b/check-services.php @@ -1,3 +1,4 @@ +#!/usr/bin/env php 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: '.$service_id.': '.$type.''); } 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: '.$type.''); } diff --git a/html/includes/forms/delete-service.inc.php b/html/includes/forms/delete-service.inc.php index 65da3381c..66bbd5255 100644 --- a/html/includes/forms/delete-service.inc.php +++ b/html/includes/forms/delete-service.inc.php @@ -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: '.$vars['service_id'].', has been deleted.'); } else { diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php index e8453febd..e638aafe0 100644 --- a/html/includes/print-menubar.php +++ b/html/includes/print-menubar.php @@ -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) { diff --git a/html/pages/addsrv.inc.php b/html/pages/addsrv.inc.php index db6b988ae..e75ff24fd 100644 --- a/html/pages/addsrv.inc.php +++ b/html/pages/addsrv.inc.php @@ -8,7 +8,7 @@ else { if ($_SESSION['userlevel'] >= '10') { $updated = '1'; - $service_id = service_add($vars['device'], $vars['type'], $vars['descr'], $vars['ip'], $vars['params'], 0); + $service_id = add_service($vars['device'], $vars['type'], $vars['descr'], $vars['ip'], $vars['params'], 0); if ($service_id) { $message .= $message_break.'Service added ('.$service_id.')!'; $message_break .= '
'; diff --git a/html/pages/device/edit/services.inc.php b/html/pages/device/edit/services.inc.php index 6aa4a0e3e..e480f88ed 100644 --- a/html/pages/device/edit/services.inc.php +++ b/html/pages/device/edit/services.inc.php @@ -5,7 +5,7 @@ if (is_admin() === true || is_read() === true) { if ($_SESSION['userlevel'] >= '10') { $updated = '1'; - $service_id = service_add($vars['device'], $vars['type'], $vars['descr'], $vars['ip'], $vars['params'], 0); + $service_id = add_service($vars['device'], $vars['type'], $vars['descr'], $vars['ip'], $vars['params'], 0); if ($service_id) { $message .= $message_break.'Service added ('.$service_id.')!'; $message_break .= '
'; diff --git a/html/pages/device/overview.inc.php b/html/pages/device/overview.inc.php index c07f94837..b7022b65b 100644 --- a/html/pages/device/overview.inc.php +++ b/html/pages/device/overview.inc.php @@ -7,7 +7,7 @@ $ports['up'] = dbFetchCell("SELECT COUNT(*) FROM `ports` WHERE device_id = $ports['down'] = dbFetchCell("SELECT COUNT(*) FROM `ports` WHERE device_id = ? AND `ifOperStatus` = 'down' AND `ifAdminStatus` = 'up'", array($device['device_id'])); $ports['disabled'] = dbFetchCell("SELECT COUNT(*) FROM `ports` WHERE device_id = ? AND `ifAdminStatus` = 'down'", array($device['device_id'])); -$services = service_status($device['device_id']); +$services = get_service_status($device['device_id']); $services['total'] = array_sum($services); if ($services[0]) { diff --git a/html/pages/services.inc.php b/html/pages/services.inc.php index 646491360..8b8cbfca1 100644 --- a/html/pages/services.inc.php +++ b/html/pages/services.inc.php @@ -4,6 +4,9 @@ $pagetitle[] = 'Services'; print_optionbar_start(); +require_once 'includes/modal/new_service.inc.php'; +require_once 'includes/modal/delete_service.inc.php'; + echo "Services » "; $menu_options = array( @@ -86,15 +89,16 @@ if (isset($state)) { } ?> -
- - - - - - - - +
+
DeviceServiceChangedMessageDescription
+ + + + + + + + = '5') { $host_sql = 'SELECT * FROM devices AS D, services AS S WHERE D.device_id = S.device_id GROUP BY D.hostname ORDER BY D.hostname'; @@ -109,7 +113,7 @@ $shift = 1; foreach (dbFetchRows($host_sql, $host_par) as $device) { $device_id = $device['device_id']; $device_hostname = $device['hostname']; - $devlink = generate_device_link($device); + $devlink = generate_device_link($device,null,array('tab' => 'services')); if ($shift == 1) { array_unshift($sql_param, $device_id); $shift = 0; @@ -129,18 +133,21 @@ foreach (dbFetchRows($host_sql, $host_par) as $device) { $status = "".$service['service_type'].""; } ?> - - - - - - - + + + + + + + + -
DeviceServiceChangedMessageDescription 
+ + +
-
+ diff --git a/includes/discovery/services.inc.php b/includes/discovery/services.inc.php index ffabf806a..3f3e3c988 100644 --- a/includes/discovery/services.inc.php +++ b/includes/discovery/services.inc.php @@ -24,7 +24,7 @@ if ($config['discover_services']) { $split_oid = explode('.', $oid); $tcp_port = $split_oid[(count($split_oid) - 6)]; if ($known_services[$tcp_port]) { - service_discover($device, $known_services[$tcp_port]); + discover_service($device, $known_services[$tcp_port]); } } } diff --git a/includes/services.inc.php b/includes/services.inc.php index c1e8cdce1..97a784596 100644 --- a/includes/services.inc.php +++ b/includes/services.inc.php @@ -1,6 +1,6 @@ 0) { // Yes, We have perf data. $filename = "services-".$service['service_id'].".rrd"; - $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename ($filename); + $rrd_filename = $config['rrd_dir'] . "/" . $service['hostname'] . "/" . safename ($filename); // Set the DS in the DB if it is blank. $DS = array(); @@ -198,13 +198,13 @@ function service_poll($service) { } if (count($update) > 0) { - service_edit($update,$service['service_id']); + edit_service($update,$service['service_id']); } return true; } -function service_check($command) { +function check_service($command) { // This array is used to test for valid UOM's to be used for graphing. // Valid values from: https://nagios-plugins.org/doc/guidelines.html#AEN200 // Note: This array must be decend from 2 char to 1 char so that the search works correctly.