nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-04 00:11:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

only poll cisco CEF and cisco mac accounting on cisco devices + some small fixes

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2999 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2012-04-09 10:53:55 +00:00
parent e826fc4b99
commit 502f207291
8 changed files with 190 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/print-menubar.php
+2 -2
View File
@@ -346,7 +346,7 @@ foreach (array('fanspeed','humidity','temperature') as $item)
{ {
if ($menu_sensors[$item]) if ($menu_sensors[$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++; unset($menu_sensors[$item]);$sep++;
} }
} }
@@ -361,7 +361,7 @@ foreach (array('current','frequency','power','voltage') as $item)
{ {
if ($menu_sensors[$item]) if ($menu_sensors[$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++; unset($menu_sensors[$item]);$sep++;
} }
} }
html/index.php
+1 -1
View File
@@ -134,7 +134,7 @@ if (isset($config['branding']) && is_array($config['branding']))
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" /> <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
<meta http-equiv="content-language" content="en-us" /> <meta http-equiv="content-language" content="en-us" />
<?php <?php
if ($config['page_refresh']) { echo("<meta http-equiv='refresh' content='".$config['page_refresh']."'>"); } if ($config['page_refresh']) { echo(' <meta http-equiv="refresh" content="'.$config['page_refresh'].'" />' . "\n"); }
?> ?>
<link href="<?php echo($config['stylesheet']); ?>" rel="stylesheet" type="text/css" /> <link href="<?php echo($config['stylesheet']); ?>" rel="stylesheet" type="text/css" />
<link rel="shortcut icon" href="<?php echo($config['favicon']); ?>" /> <link rel="shortcut icon" href="<?php echo($config['favicon']); ?>" />
includes/defaults.inc.php
+1 -1
View File
@@ -69,7 +69,7 @@ $config['stylesheet'] = "css/styles.css";
$config['mono_font'] = "DejaVuSansMono"; $config['mono_font'] = "DejaVuSansMono";
$config['favicon'] = "images/observium-icon.png"; $config['favicon'] = "images/observium-icon.png";
$config['header_color'] = "#1F334E"; $config['header_color'] = "#1F334E";
$config['page_refresh'] = "300"; ## Refresh the page every xx seconds $config['page_refresh'] = "300"; ## Refresh the page every xx seconds, 0 to disable
$config['front_page'] = "pages/front/default.php"; $config['front_page'] = "pages/front/default.php";
$config['page_title'] = "Observium :: Network Observation and Monitoring"; $config['page_title'] = "Observium :: Network Observation and Monitoring";
$config['timestamp_format'] = 'd-m-Y H:i:s'; $config['timestamp_format'] = 'd-m-Y H:i:s';
includes/discovery/entity-sensor.inc.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php <?php
echo(" ENTITY-SENSOR "); echo(" ENTITY-SENSOR: ");
echo("\nCaching OIDs:"); echo("\nCaching OIDs:");
includes/discovery/temperatures/lm-sensors.inc.php
+1 -1
View File
@@ -5,7 +5,7 @@ if ($device['os'] == "linux")
$oids = snmp_walk($device, "lmTempSensorsDevice", "-Osqn", "LM-SENSORS-MIB"); $oids = snmp_walk($device, "lmTempSensorsDevice", "-Osqn", "LM-SENSORS-MIB");
if ($debug) { echo($oids."\n"); } if ($debug) { echo($oids."\n"); }
$oids = trim($oids); $oids = trim($oids);
if ($oids) echo("LM-SENSORS-MIB "); if ($oids) echo("LM-SENSORS-MIB: ");
foreach (explode("\n", $oids) as $data) foreach (explode("\n", $oids) as $data)
{ {
$data = trim($data); $data = trim($data);
includes/polling/cisco-cef.inc.php
+3
View File
@@ -1,5 +1,7 @@
<?php <?php
if ($device['os_group'] == "cisco")
{
echo("Cisco CEF Switching Path: "); echo("Cisco CEF Switching Path: ");
$cefs = array(); $cefs = array();
@@ -104,5 +106,6 @@ foreach ($cefs_db as $cef_switching_id)
} }
echo("\n"); echo("\n");
} # os_group = cisco
?> ?>
includes/polling/cisco-mac-accounting.inc.php
+3
View File
@@ -2,6 +2,8 @@
## FIXME -- we're walking, so we can discover here too. ## FIXME -- we're walking, so we can discover here too.
if ($device['os_group'] == "cisco")
{
$cip_oids = array('cipMacHCSwitchedBytes', 'cipMacHCSwitchedPkts'); $cip_oids = array('cipMacHCSwitchedBytes', 'cipMacHCSwitchedPkts');
echo("Cisco MAC - Caching OID: "); echo("Cisco MAC - Caching OID: ");
$cip_array = array(); $cip_array = array();
@@ -95,5 +97,6 @@ unset($cip_array);
if ($mac_entries) { echo(" $mac_entries MAC accounting entries\n"); } if ($mac_entries) { echo(" $mac_entries MAC accounting entries\n"); }
echo("\n"); echo("\n");
}
?> ?>