nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-12 16:06:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Major changes to graphing system organisation. Prevent sensors from being discovered in ENTITY-SENSOR-MIB if they've already been detected in CISCO-ENTITY-SENSOR-MIB (they share entPhysicalIndex). Fix ADSL poller. Make popup overlibs prettier as default.

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1470 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-07-24 19:14:41 +00:00
parent 289228a544
commit ada14bd542
125 changed files with 432 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/functions.inc.php
+9 -4
View File
@@ -49,17 +49,20 @@ function generatedevicelink($device, $text=0, $start=0, $end=0)
}
$url = $config['base_url']."/device/" . $device['device_id'] . "/";
$contents = "<div class=list-large>".$device['hostname'] . " - $descr</div>";
$contents = "<div class=list-large>".$device['hostname'];
if($device['hardware']) { $contents .= " - ".$device['hardware']; }
$contents .= "</div>";
$contents .= "<div>";
if($device['os']) { $contents .= $config['os'][$device['os']]['text']; }
if($device['version']) { $contents .= " ".$device['version']; }
if($device['features']) { $contents .= " (".$device['features'].")"; }
if($device['hardware']) { $contents .= " - ".$device['hardware']; }
# if($device['hardware']) { $contents .= " - ".$device['hardware']; }
$contents .= "</div>";
if (isset($device['location'])) { $contents .= "" . htmlentities($device['location'])."<br />"; }
# if (isset($device['location'])) { $contents .= "" . htmlentities($device['location'])."<br />"; }
foreach ($graphs as $entry)
{
$graph = $entry['graph'];
@@ -204,6 +207,8 @@ function generate_if_link($args, $text = NULL)
$args = ifNameDescr($args);
if(!$text) { $text = fixIfName($args['label']); }
if(!$args['graph_type']) { $args['graph_type'] = 'port_bits'; }
$class = ifclass($args['ifOperStatus'], $args['ifAdminStatus']);
if(!isset($args['hostname'])) { $args = array_merge($args, device_by_id_cache($args['device_id'])); }
@@ -238,7 +243,7 @@ function generate_if_link($args, $text = NULL)
function generate_port_thumbnail($args)
{
if(!$args['bg']) { $args['bg'] = "FFFFF"; }
$args['content'] = "<img src='graph.php?type=".$args['graph_type']."&id=".$args['interface_id']."&from=".$args['from']."&to=".$args['to']."&width=".$args['width']."&height=".$args['height']."&legend=no&bg=".$args['bg']."'>";
$args['content'] = "<img src='graph.php?type=".$args['graph_type']."&subtype=".$args['graph_subtype']."&id=".$args['interface_id']."&from=".$args['from']."&to=".$args['to']."&width=".$args['width']."&height=".$args['height']."&legend=no&bg=".$args['bg']."'>";
$output = generate_if_link($args, $args['content']);
echo $output;
}