clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-29 06:16:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #934 from f0o/issue-933

Browse Source 
Add bills to rulesuggest, link to bills in alerts table and adds function`generate_bill_url`
This commit is contained in:
Neil Lathwood 2015-05-07 21:55:37 +01:00
commit 36da5311f3
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
html/ajax_rulesuggest.php
View File

@ -91,6 +91,7 @@ if( isset($_GET['term'],$_GET['device_id']) ) {
$chk[] = $tst['TABLE_NAME'].'.';
}
$chk[] = 'macros.';
$chk[] = 'bills.';
}
}
if( sizeof($chk) > 0 ) {

4
html/includes/functions.inc.php
View File

@ -468,6 +468,10 @@ function generate_peer_url($peer, $vars=array())
return generate_url(array('page' => 'device', 'device' => $peer['device_id'], 'tab' => 'routing', 'proto' => 'bgp'), $vars);
}
function generate_bill_url($bill, $vars=array()) {
return generate_url(array('page' => 'bill', 'bill_id' => $bill['bill_id']), $vars);
}
function generate_port_image($args)
{
if (!$args['bg']) { $args['bg'] = "FFFFFF"; }

14
html/includes/table/alerts.inc.php
View File

@ -42,11 +42,17 @@ foreach (dbFetchRows($sql,$param) as $alert) {
$log_detail = json_decode(gzuncompress($log),true);
$fault_detail = '';
foreach ( $log_detail['rule'] as $o=>$tmp_alerts ) {
$fallback = true;
$fault_detail .= "#".($o+1).": ";
$tmp = generate_port_link($tmp_alerts);
if( substr($tmp,-5,1) != ">" ) {
$fault_detail .= $tmp;
} else {
if( $tmp_alerts['bill_id'] ) {
$fault_detail .= '<a href="'.generate_bill_url($tmp_alerts).'">'.$tmp_alerts['bill_name'].'</a>;&nbsp;';
$fallback = false;
}
if( $tmp_alerts['port_id'] ) {
$fault_detail .= generate_port_link($tmp_alerts).';&nbsp;';
$fallback = false;
}
if( $fallback === true ) {
foreach ($tmp_alerts as $k=>$v) {
if (!empty($v) && $k != 'device_id' && (stristr($k,'id') || stristr($k,'desc') || stristr($k,'msg')) && substr_count($k,'_') <= 1) {
$fault_detail .= "$k => '$v', ";