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

Merge pull request #2214 from laf/nagios-plugins

Browse Source 
Dynamic use of nagios-service checks
This commit is contained in:
Daniel Preussker
2015-11-05 21:13:15 +01:00
parent a69eedb704 d39f1d71a6
commit 97392b1c1d
6 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
html/pages/addsrv.inc.php
View File

@@ -9,7 +9,7 @@ else {
$updated = '1';
// FIXME should call add_service (needs more parameters)
$service_id = dbInsert(array('device_id' => $_POST['device'], 'service_ip' => $_POST['ip'], 'service_type' => $_POST['type'], 'service_desc' => $_POST['descr'], 'service_param' => $_POST['params'], 'service_ignore' => '0'), 'services');
$service_id = dbInsert(array('device_id' => $_POST['device'], 'service_ip' => $_POST['ip'], 'service_type' => $_POST['type'], 'service_desc' => $_POST['descr'], 'service_param' => $_POST['params'], 'service_ignore' => '0', 'service_status' => '0', 'service_checked' => '0', 'service_changed' => '0', 'service_message' => 'New check', 'service_disabled' => '0'), 'services');
if ($service_id) {
$message .= $message_break.'Service added ('.$service_id.')!';
@@ -18,10 +18,11 @@ else {
}
}
if ($handle = opendir($config['install_dir'].'/includes/services/')) {
if ($handle = opendir($config['nagios_plugins'])) {
while (false !== ($file = readdir($handle))) {
if ($file != '.' && $file != '..' && !strstr($file, '.')) {
$servicesform .= "<option value='$file'>$file</option>";
if ($file != '.' && $file != '..' && !strstr($file, '.') && strstr($file, 'check_')) {
list(,$check_name) = explode('_',$file,2);
$servicesform .= "<option value='$check_name'>$check_name</option>";
}
}

2
html/pages/services.inc.php
View File

@@ -8,7 +8,6 @@ echo "<span style='font-weight: bold;'>Services</span> &#187; ";
$menu_options = array(
'basic' => 'Basic',
'details' => 'Details',
);
$sql_param = array();
@@ -68,7 +67,6 @@ echo '<div class="table-responsive">
<tr>
<th>Device</th>
<th>Service</th>
<th>Status</th>
<th>Changed</th>
<th>Message</th>
</tr>';