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

fixes to layout. fix netstats icmp/snmp poller (specify mib name)

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2444 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-09-12 02:35:58 +00:00
parent d788589571
commit 27117e2c25
6 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
html/css/styles.css
View File

@@ -18,9 +18,14 @@ body {
.pagemenu-selected { .pagemenu-selected {
font-weight: bold; font-weight: bold;
background-color: #cecece; background-color: #cecece;
-moz-border-radius: 15px;
border-radius: 15px; padding:3px 8px 4px 8px;
padding: 2px 8px 3px 8px;
/* Rounded Corners */
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
border-radius: 10px;
} }
.submit { .submit {
@@ -746,8 +751,8 @@ a.interface-upup:hover, a.interface-updown:hover, a.interface-admindown:hover {
/* Gradient background */ /* Gradient background */
background:#F4F4F4; background:#F4F4F4;
background: -moz-linear-gradient(top, #FFF, #CCC); background: -moz-linear-gradient(top, #FBFBFB, #DDD);
background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#FFF), to(#CCC)); background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#FBFBFB), to(#DDD));
/* Rounded Corners */ /* Rounded Corners */
-moz-border-radius: 0px 3px 3px 3px; -moz-border-radius: 0px 3px 3px 3px;

2
html/pages/device/apps.inc.php
View File

@@ -2,6 +2,8 @@
print_optionbar_start(); print_optionbar_start();
echo("<span style='font-weight: bold;'>Apps</span> &#187; ");
unset($sep); unset($sep);
foreach (dbFetchRows("SELECT * FROM `applications` WHERE `device_id` = ?", array($device['device_id'])) as $app) foreach (dbFetchRows("SELECT * FROM `applications` WHERE `device_id` = ?", array($device['device_id'])) as $app)

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

@@ -1,5 +1,7 @@
<?php print_optionbar_start(); <?php print_optionbar_start();
echo("<span style='font-weight: bold;'>Services</span> &#187; ");
$menu_options = array('basic' => 'Basic', $menu_options = array('basic' => 'Basic',
'details' => 'Details'); 'details' => 'Details');

8
html/pages/ports/default.inc.php
View File

@@ -139,7 +139,7 @@ if ($_POST['deleted'] || $_GET['type'] == "deleted") { $where .= " AND I.deleted
$query = "SELECT * FROM `ports` AS I, `devices` AS D WHERE I.device_id = D.device_id ".$where." ORDER BY D.hostname, I.ifIndex"; $query = "SELECT * FROM `ports` AS I, `devices` AS D WHERE I.device_id = D.device_id ".$where." ORDER BY D.hostname, I.ifIndex";
echo("<tr class=tablehead><td></td><th>Device</a></th><th>Interface</th><th>Speed</th><th>Media</th><th>Description</th></tr>"); echo("<tr class=tablehead><td></td><th>Device</a></th><th>Interface</th><th>Speed</th><th>Down</th><th>Up</th><th>Media</th><th>Description</th></tr>");
$row = 1; $row = 1;
@@ -150,6 +150,10 @@ foreach (dbFetchRows($query, $param) as $interface)
$speed = humanspeed($interface['ifSpeed']); $speed = humanspeed($interface['ifSpeed']);
$type = humanmedia($interface['ifType']); $type = humanmedia($interface['ifType']);
$interface['in_rate'] = formatRates($interface['ifInOctets_rate'] * 8);
$interface['out_rate'] = formatRates($interface['ifOutOctets_rate'] * 8);
if ($interface['in_errors'] > 0 || $interface['out_errors'] > 0) if ($interface['in_errors'] > 0 || $interface['out_errors'] > 0)
{ {
$error_img = generate_port_link($interface,"<img src='images/16/chart_curve_error.png' alt='Interface Errors' border=0>",errors); $error_img = generate_port_link($interface,"<img src='images/16/chart_curve_error.png' alt='Interface Errors' border=0>",errors);
@@ -163,6 +167,8 @@ foreach (dbFetchRows($query, $param) as $interface)
<td width=200 class=list-bold>" . generate_device_link($interface) . "</td> <td width=200 class=list-bold>" . generate_device_link($interface) . "</td>
<td width=150 class=list-bold>" . generate_port_link($interface) . " $error_img</td> <td width=150 class=list-bold>" . generate_port_link($interface) . " $error_img</td>
<td width=110 >$speed</td> <td width=110 >$speed</td>
<td width=110 class=green>".$interface['in_rate']."</td>
<td width=110 class=blue>".$interface['out_rate']."</td>
<td width=200>$type</td> <td width=200>$type</td>
<td>" . $interface['ifAlias'] . "</td> <td>" . $interface['ifAlias'] . "</td>
</tr>\n"); </tr>\n");

4
includes/polling/netstats-icmp.inc.php
View File

@@ -25,7 +25,7 @@ if ($device['os'] != "Snom")
$snmpstring .= " $oid.0"; $snmpstring .= " $oid.0";
} }
$data_array = snmpwalk_cache_oid($device, "icmp", array()); $data_array = snmpwalk_cache_oid($device, "IP-MIB::icmp", array());
$rrdupdate = "N"; $rrdupdate = "N";
@@ -53,4 +53,4 @@ if ($device['os'] != "Snom")
unset($oids, $data, $data_array, $oid, $protos); unset($oids, $data, $data_array, $oid, $protos);
} }
?> ?>

4
includes/polling/netstats-snmp.inc.php
View File

@@ -23,7 +23,7 @@ if ($device['os'] != "Snom")
$rrd_create .= " DS:$oid_ds:COUNTER:600:U:100000000000"; $rrd_create .= " DS:$oid_ds:COUNTER:600:U:100000000000";
} }
$data_array = snmpwalk_cache_oid($device, "snmp", array()); $data_array = snmpwalk_cache_oid($device, "SNMPv2-MIB::snmp", array());
$rrdupdate = "N"; $rrdupdate = "N";
@@ -49,4 +49,4 @@ if ($device['os'] != "Snom")
unset($oids, $data, $data_array, $oid, $protos); unset($oids, $data, $data_array, $oid, $protos);
} }
?> ?>