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

updates from sid3windr

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@572 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2009-12-30 21:02:05 +00:00
parent b546061d8c
commit 3eb057c4a2
6 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/includes/hostbox.inc
View File

@@ -1,6 +1,6 @@
<?php <?php
if($bg == $list_colour_a) { $bg = $list_colour_b; } else { $bg = $list_colour_a; } if($bg == $list_colour_b) { $bg = $list_colour_a; } else { $bg = $list_colour_b; }
if ($device['status'] == '0') { $class = "list-device-down"; } else { $class = "list-device"; } if ($device['status'] == '0') { $class = "list-device-down"; } else { $class = "list-device"; }
if ($device['ignore'] == '1') { if ($device['ignore'] == '1') {
$class = "list-device-ignored"; $class = "list-device-ignored";

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

@@ -135,7 +135,7 @@ if($_SESSION['userlevel'] >= '5') {
if($config['int_l2tp']) { echo("<li><a href='iftype/l2tp/'><img src='images/16/user.png'border=0 align=absmiddle> L2TP</a></li>"); $ifbreak = 1; } if($config['int_l2tp']) { echo("<li><a href='iftype/l2tp/'><img src='images/16/user.png'border=0 align=absmiddle> L2TP</a></li>"); $ifbreak = 1; }
if($config['int_transit']) { echo("<li><a href='iftype/transit/'><img src='images/16/lorry_link.png' border=0 align=absmiddle> Transit</a></li>"); $ifbreak = 1; } if($config['int_transit']) { echo("<li><a href='iftype/transit/'><img src='images/16/lorry_link.png' border=0 align=absmiddle> Transit</a></li>"); $ifbreak = 1; }
if($config['int_peering']) { echo("<li><a href='iftype/peering/'><img src='images/16/bug_link.png' border=0 align=absmiddle> Peering</a></li>"); $ifbreak = 1; } if($config['int_peering']) { echo("<li><a href='iftype/peering/'><img src='images/16/bug_link.png' border=0 align=absmiddle> Peering</a></li>"); $ifbreak = 1; }
if($config['int_peering'] && $config['int_transit']) { echo("<li><a href='iftype/peering,transit/'><img src='images/16/world_link.png' border=0 align=absmiddle> Peer + Transit</a></li>"); $ifbreak = 1; } if($config['int_peering'] && $config['int_transit']) { echo("<li><a href='iftype/peering,transit/'><img src='images/16/world_link.png' border=0 align=absmiddle> Peering + Transit</a></li>"); $ifbreak = 1; }
if($config['int_core']) { echo("<li><a href='iftype/core/'><img src='images/16/brick_link.png' border=0 align=absmiddle> Core</a></li>"); $ifbreak = 1;} if($config['int_core']) { echo("<li><a href='iftype/core/'><img src='images/16/brick_link.png' border=0 align=absmiddle> Core</a></li>"); $ifbreak = 1;}
} }
@@ -156,9 +156,9 @@ echo("<li><a href='?page=interfaces&status=0'><img src='images/16/link_error.png
</li> </li>
<li><a class="menu2four" href="?page=temperatures"><img src='images/16/weather_sun.png' border=0 align=absmiddle> Temps</a></li> <li><a class="menu2four" href="/temperatures/"><img src='images/16/weather_sun.png' border=0 align=absmiddle> Temps</a></li>
<li><a class="menu2four" href="?page=storage"><img src='images/16/database.png' border=0 align=absmiddle> Storage</a></li> <li><a class="menu2four" href="/storage/"><img src='images/16/database.png' border=0 align=absmiddle> Storage</a></li>
<!-- <li><a class="menu2four" href="?page=inventory"><img src='images/16/bricks.png' border=0 align=absmiddle> Inventory</a></li> --> <!-- <li><a class="menu2four" href="?page=inventory"><img src='images/16/bricks.png' border=0 align=absmiddle> Inventory</a></li> -->
@@ -196,7 +196,7 @@ echo(" <li><hr /></li>
<!--[if IE 7]><!--></a><!--<![endif]--> <!--[if IE 7]><!--></a><!--<![endif]-->
<table><tr><td> <table><tr><td>
<ul> <ul>
<li><a href="?page=preferences"><img src='images/16/wrench_orange.png' border=0 align=absmiddle> My Settings</a></li> <li><a href="/preferences/"><img src='images/16/wrench_orange.png' border=0 align=absmiddle> My Settings</a></li>
<?php if($_SESSION['userlevel'] >= '10') { <?php if($_SESSION['userlevel'] >= '10') {
echo(" echo("
<li><hr width=140 /></li> <li><hr width=140 /></li>

3
html/pages/devices.php
View File

@@ -112,7 +112,8 @@ if($_GET['status'] == "alerted") {
$sql = "select * from devices " . $device_alert_sql . " GROUP BY `device_id` ORDER BY `ignore`, `status`, `os`, `hostname`"; $sql = "select * from devices " . $device_alert_sql . " GROUP BY `device_id` ORDER BY `ignore`, `status`, `os`, `hostname`";
} }
echo("<table cellpadding=7 cellspacing=0 class=devicetable width=100%>"); echo('<table cellpadding="7" cellspacing="0" class="devicetable" width="100%">
<tr class="tablehead"><th></th><th>Device</th><th>Operating System</th><th>Platform</th><th>Uptime</th></tr>');
$device_query = mysql_query($sql); $device_query = mysql_query($sql);
while($device = mysql_fetch_array($device_query)) { while($device = mysql_fetch_array($device_query)) {

6
html/pages/iftype.php
View File

@@ -19,8 +19,12 @@ echo("<table cellpadding=7 cellspacing=0 class=devicetable width=100%>");
} }
unset($seperator); unset($seperator);
$types_array = explode(',',$_GET['opta']);
for ($i = 0; $i < count($types_array);$i++) $types_array[$i] = ucfirst($types_array[$i]);
$types = implode(' + ',$types_array);
echo("<tr bgcolor='$bg'> echo("<tr bgcolor='$bg'>
<td><span class=list-large>Total Graph for interfaces of type : ".$_GET['opta']."</span></td></tr>"); <td><span class=list-large>Total Graph for interfaces of type : ".$types."</span></td></tr>");
echo("<tr bgcolor='$bg'><td>"); echo("<tr bgcolor='$bg'><td>");
$graph_type = "multi_bits"; $graph_type = "multi_bits";

2
html/pages/locations.php
View File

@@ -27,7 +27,7 @@ while($device = mysql_fetch_array($device_query)) {
$hostalerts = mysql_result(mysql_query("SELECT COUNT(device_id) FROM devices AS D, devices_perms AS P WHERE location = '" . $device['location'] . "' AND status = '0'"),0); $hostalerts = mysql_result(mysql_query("SELECT COUNT(device_id) FROM devices AS D, devices_perms AS P WHERE location = '" . $device['location'] . "' AND status = '0'"),0);
} }
if($hostalerts) { $alert = "<img src='images/16/flag_red.png'>"; } if($hostalerts) { $alert = "<img src='images/16/flag_red.png'>"; } else { $alert = ""; }
$loc = $device[location]; $loc = $device[location];

2
includes/discovery/temperatures.php
View File

@@ -92,9 +92,9 @@
## Supermicro Temperatures ## Supermicro Temperatures
if($device['os'] == "linux") { if($device['os'] == "linux") {
echo("Supermicro ");
$oids = shell_exec($config['snmpwalk'] . " -m SUPERMICRO-HEALTH-MIB -$snmpver -CI -Osqn -c $community $hostname:$port 1.3.6.1.4.1.10876.2.1.1.1.1.3 | sed s/1.3.6.1.4.1.10876.2.1.1.1.1.3.//g"); $oids = shell_exec($config['snmpwalk'] . " -m SUPERMICRO-HEALTH-MIB -$snmpver -CI -Osqn -c $community $hostname:$port 1.3.6.1.4.1.10876.2.1.1.1.1.3 | sed s/1.3.6.1.4.1.10876.2.1.1.1.1.3.//g");
$oids = trim($oids); $oids = trim($oids);
if ($oids) echo("Supermicro ");
foreach(explode("\n", $oids) as $data) { foreach(explode("\n", $oids) as $data) {
$data = trim($data); $data = trim($data);
if($data) { if($data) {