Merge pull request #2214 from laf/nagios-plugins

Dynamic use of nagios-service checks
This commit is contained in:
Daniel Preussker
2015-11-05 21:13:15 +01:00
6 changed files with 24 additions and 14 deletions

View File

@@ -47,6 +47,7 @@ echo "
<input name='params' id='params' class='form-control input-sm'>
</div>
<div class='col-sm-5'>
This may be required based on the service check.
</div>
</div>
<button type='submit' name='Submit' class='btn btn-success input-sm'>Add Service</button>

View File

@@ -26,6 +26,9 @@ if (isset($_POST['service']) && is_numeric($_POST['service'])) {
<div class='col-sm-5'>
<input name='params' id='params' value='".$service['service_param']."' class='form-control input-sm'>
</div>
<div class='col-sm-5'>
This may be required based on the service check.
</div>
</div>
<button type='submit' id='confirm-editsrv' name='confirm-editsrv' value='yes' class='btn btn-primary input-sm'>Edit Service</button>
</div>

View File

@@ -42,11 +42,11 @@ $popup .= "</div><img src=\'graph.php?id=".$service['service_id'].'&amp;type=ser
$popup .= "', RIGHT".$config['overlib_defaults'].');" onmouseout="return nd();"';
echo "
<tr style=\"background-color: $bg; padding: 5px;\">";
<tr>";
if ($device_id) {
if (!$samehost) {
echo "<td valign=top width=250><span style='font-weight:bold;'>".generate_device_link($device).'</span></td>';
echo "<td>".generate_device_link($device).'</span></td>';
}
else {
echo '<td></td>';
@@ -54,14 +54,13 @@ if ($device_id) {
}
echo "
<td valign=top class=list-bold>
<td>
$status
</td>
<td valign=top><a $popup><img src='$mini_url'></a></td>
<td valign=top width=175>
<td>
$since
</td>
<td valign=top>
<td>
<span class=box-desc>$message</span>
</td>
</tr>";