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

Lots of nice new things! Yum.

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@220 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2008-04-03 19:04:24 +00:00
parent 77c0647062
commit 4e10de77a7
13 changed files with 281 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/functions.php
+3 -3
View File
@@ -111,11 +111,11 @@ function interfacepermitted($interface_id) {
global $_SESSION;
if($_SESSION['userlevel'] >= "5") {
$allowed = true;
$allowed = TRUE;
} elseif ( devicepermitted(mysql_result(mysql_query("SELECT device_id FROM interface WHERE interface_id = '$interface_id'"),0))) {
$allowed = true;
$allowed = TRUE;
} elseif ( @mysql_result(mysql_query("SELECT count(*) FROM interface_perms WHERE `user_id` = '" . $_SESSION['user_id'] . "' AND `interface_id` = $interface_id"), 0) > '0') {
$allowed = true;
$allowed = TRUE;
} else { $allowed = FALSE; }
return $allowed;
}
includes/osdiscovery/discover-screenos.php
+2 -2
View File
@@ -2,8 +2,8 @@
if(!$os) {
$sysObjectId = shell_exec($config['snmpget'] . " -Ovq -m ".$config['installdir']."/mibs/NS-PRODUCTS.mib -v2c -c ". $community ." ". $hostname ." .1.3.6.1.2.1.1.2.0");
if(strstr($sysObjectId, "netscreen")) { $os = "Netscreen"; }
$sysObjectId = shell_exec($config['snmpget'] . " -Ovq -m ".$config['mibs_dir']."/NS-PRODUCTS.mib -v2c -c ". $community ." ". $hostname ." .1.3.6.1.2.1.1.2.0");
if(strstr($sysObjectId, "netscreen")) { $os = "ScreenOS"; }
}
includes/polling/device-screenos.inc.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?
echo("doing SCREENOS");
echo("Doing Juniper Netscreen ScreenOS");
$cpurrd = $rrd_dir . "/" . $device['hostname'] . "/netscreen-cpu.rrd";
$memrrd = $rrd_dir . "/" . $device['hostname'] . "/netscreen-memory.rrd";
includes/unix-graphing.php
+1 -1
View File
@@ -241,7 +241,7 @@ function cpugraphUnix ($rrd, $graph, $from, $to, $width, $height, $title, $verti
$database = $rrd_dir . "/" . $rrd;
$imgfile = "graphs/" . "$graph";
$period = $to - $from;
$options = "--alt-autoscale-max -E --start $from --end $to --width $width --height $height ";
$options = "-l 0 --alt-autoscale-max -E --start $from --end $to --width $width --height $height ";
if($width <= "300") { $options .= " --font LEGEND:7:$mono_font --font AXIS:6:$mono_font --font-render-mode normal "; }
$options .= " DEF:user=$database:user:AVERAGE";
$options .= " DEF:nice=$database:nice:AVERAGE";