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

correctly case dBm instead of Dbm, minor fixes

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2997 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2012-04-08 16:21:52 +00:00
parent ded64baae9
commit a96f6064ea
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/includes/print-menubar.php
View File

@@ -374,7 +374,7 @@ if ($sep && array_keys($menu_sensors))
foreach (array_keys($menu_sensors) as $item)
{
echo('<li><a href="health/metric='.$item.'/"><img src="images/icons/'.$item.'.png" border="0" align="absmiddle" /> '.ucfirst($item).'</a></li>');
echo('<li><a href="health/metric='.$item.'/"><img src="images/icons/'.$item.'.png" border="0" align="absmiddle" /> '.nicecase($item).'</a></li>');
unset($menu_sensors[$item]);$sep++;
}

2
includes/discovery/processors/hrdevice.inc.php
View File

@@ -1,6 +1,6 @@
<?php
echo("hrDevice ");
echo(" hrDevice: ");
$hrDevice_oids = array('hrDevice','hrProcessorLoad');
unset($hrDevice_array);
foreach ($hrDevice_oids as $oid) { $hrDevice_array = snmpwalk_cache_oid($device, $oid, $hrDevice_array, "HOST-RESOURCES-MIB:HOST-RESOURCES-TYPES"); }

2
includes/discovery/temperatures/cisco-envmon.inc.php
View File

@@ -2,7 +2,7 @@
if (mysql_result(mysql_query("SELECT COUNT(*) FROM `sensors` WHERE `device_id` = '".$device['device_id']."' AND `sensor_class` = 'temperature' AND (`sensor_type` = 'cisco-entity-sensor' OR `sensor_type` = 'entity-sensor')"),0) == "0" && ($device['os_group'] == "cisco"))
{
echo("CISCO-ENVMON-MIB ");
echo("CISCO-ENVMON-MIB: ");
$oids = snmp_walk($device, ".1.3.6.1.4.1.9.9.13.1.3.1.2", "-Osqn", "CISCO-ENVMON-MIB");
$oids = str_replace('.1.3.6.1.4.1.9.9.13.1.3.1.2.','',$oids);
$oids = trim($oids);

6
includes/functions.php
View File

@@ -18,6 +18,12 @@ include_once($config['install_dir'] . "/includes/services.inc.php");
include_once($config['install_dir'] . "/includes/dbFacile.php");
include_once($config['install_dir'] . "/includes/console_colour.php");
function nicecase($item)
{
if ($item == "dbm") { return "dBm"; }
else return ucfirst($item);
}
function mac_clean_to_readable($mac)
{
$r = substr($mac, 0, 2);