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 #1096 from laf/issue-1095-web

Browse Source 
Added support for interval for alerting for WebUI
This commit is contained in:
Neil Lathwood
2015-06-20 01:56:08 +01:00
parent 26c3ac5755 1e34fb0753
commit 8226e8b447
4 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
html/includes/modal/new_alert_rule.inc.php
View File

@@ -93,10 +93,14 @@ if(is_admin() !== false) {
<div class='col-sm-2'>
<input type='text' id='count' name='count' class='form-control'>
</div>
<label for='delay' class='col-sm-3 control-label'>Alert delay: </label>
<label for='delay' class='col-sm-1 control-label'>Delay: </label>
<div class='col-sm-2'>
<input type='text' id='delay' name='delay' class='form-control'>
</div>
<label for='interval' class='col-sm-2 control-label'>Interval: </label>
<div class='col-sm-2'>
<input type='text' id='interval' name='interval' class='form-control'>
</div>
</div>
<div class='form-group'>
<label for='mute' class='col-sm-3 control-label'>Mute alerts: </label>
@@ -202,6 +206,16 @@ $('#create-alert').on('show.bs.modal', function (event) {
var delay = extra['delay'];
}
$('#delay').val(delay);
if((extra['interval'] / 86400) >= 1) {
var interval = extra['interval'] / 86400 + ' d';
} else if((extra['interval'] / 3600) >= 1) {
var interval = extra['interval'] / 3600 + ' h';
} else if((extra['interval'] / 60) >= 1) {
var interval = extra['interval'] / 60 + ' m';
} else {
var interval = extra['interval'];
}
$('#interval').val(interval);
$("[name='mute']").bootstrapSwitch('state',extra['mute']);
$("[name='invert']").bootstrapSwitch('state',extra['invert']);
$('#name').val(output['name']);

4
html/includes/print-alert-rules.php
View File

@@ -122,7 +122,7 @@ foreach( dbFetchRows($full_query, $param) as $rule ) {
echo "<tr class='".$extra."' id='row_".$rule['id']."'>";
echo "<td><i>#".((int) $rulei++)."</i></td>";
echo "<td>".$rule['name']."</td>";
echo "<td>";
echo "<td class='col-sm-4'>";
if($rule_extra['invert'] === true) {
echo "<strong><em>Inverted</em></strong> ";
}
@@ -132,7 +132,7 @@ foreach( dbFetchRows($full_query, $param) as $rule ) {
if($rule_extra['mute'] === true) {
echo "<span class='glyphicon glyphicon-volume-off glyphicon-large text-primary' aria-hidden='true'></span></td>";
}
echo "<td><small>Max: ".$rule_extra['count']."<br />Delay: ".$rule_extra['delay']."</small></td>";
echo "<td><small>Max: ".$rule_extra['count']."<br />Delay: ".$rule_extra['delay']."<br />Interval: ".$rule_extra['interval']."</small></td>";
echo "<td>";
if ($_SESSION['userlevel'] >= '10') {
echo "<input id='".$rule['id']."' type='checkbox' name='alert-rule' data-orig_class='".$orig_class."' data-orig_colour='".$orig_col."' data-orig_state='".$orig_ico."' data-alert_id='".$rule['id']."' ".$alert_checked." data-size='small'>";