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

fix map graphviz paths, and mikrotik client poll

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2650 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-10-05 13:59:21 +00:00
parent 8364eb102b
commit 0e72bffa66
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/map.php
+3 -3
View File
@@ -156,12 +156,12 @@ if (isset($_GET['format']) && preg_match("/^[a-z]*$/", $_GET['format']))
if ($links > 10) ### Unflatten if there are more than 10 links. beyond that it gets messy if ($links > 10) ### Unflatten if there are more than 10 links. beyond that it gets messy
{ {
$maptool = 'unflatten -f -l 5 | dot'; $maptool = $config['unflatten'] ' -f -l 5 | ' . $config['dot'];
} else { } else {
$maptool = 'dot'; $maptool = $config['dot'];
} }
if ($where == '') { $maptool = 'sfdp -Gpack -Gcharset=latin1 -Gsize=200,200'; } if ($where == '') { $maptool = $config['sdfp'] ' -Gpack -Gcharset=latin1 -Gsize=200,200'; }
$img = shell_exec("echo \"".addslashes($map)."\" | $maptool -T".$_GET['format'].""); $img = shell_exec("echo \"".addslashes($map)."\" | $maptool -T".$_GET['format']."");
if ($_GET['format'] == "png") if ($_GET['format'] == "png")
includes/defaults.inc.php
+1
View File
@@ -31,6 +31,7 @@ $config['virsh'] = "/usr/bin/virsh";
$config['dot'] = "/usr/bin/dot"; $config['dot'] = "/usr/bin/dot";
$config['unflatten'] = "/usr/bin/unflatten"; $config['unflatten'] = "/usr/bin/unflatten";
$config['neato'] = "/usr/bin/neato"; $config['neato'] = "/usr/bin/neato";
$config['sfdp'] = "/usr/bin/sfdp";
### RRDCacheD - Make sure it can write to your RRD dir! ### RRDCacheD - Make sure it can write to your RRD dir!
includes/polling/wifi.inc.php
+1 -1
View File
@@ -37,7 +37,7 @@ if ($device['type'] == 'network' || $device['type'] == 'firewall')
{ {
echo("Checking RouterOS Wireless clients... "); echo("Checking RouterOS Wireless clients... ");
$wificlients1 = snmp_get($device, "mtxrWlApClientCount.10", "-OUqnv", "MIKROTIK-MIB"); $wificlients1 = snmp_get($device, "mtxrWlApClientCount", "-OUqnv", "MIKROTIK-MIB");
echo(($wificlients1 +0) . " clients\n"); echo(($wificlients1 +0) . " clients\n");
break; break;