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

fixes

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@308 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2008-11-20 14:58:11 +00:00
parent 81c75b3d92
commit 0c4fa28c5e
4 changed files with 30 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/generate-dnstext.php
+17 -4
View File
@@ -20,11 +20,11 @@ while($ip = mysql_fetch_array($data)) {
$hostname = str_replace(".wtibs.net", "", $hostname); $hostname = str_replace(".wtibs.net", "", $hostname);
$hostname = str_replace(".jerseytelecom.net", "", $hostname); $hostname = str_replace(".jerseytelecom.net", "", $hostname);
list($loc, $host) = explode("-", $hostname); list($cc, $loc, $host) = explode(".", $hostname);
if($host) { if($host) {
$hostname = "$host.$loc.v4.jerseytelecom.net"; $hostname = "$host.$loc.$cc.v4.jerseytelecom.net";
} else { } else {
$host = $loc; unset ($loc); $host = $cc; unset ($cc);
$hostname = "$host.v4.jerseytelecom.net"; $hostname = "$host.v4.jerseytelecom.net";
} }
@@ -47,8 +47,21 @@ while($ip = mysql_fetch_array($data)) {
$reverse = "$fourth.$revzone"; $reverse = "$fourth.$revzone";
$dnsname = "$interface.$hostname"; $dnsname = "$interface.$hostname";
echo(str_pad($reverse, 35)."IN ADDR ".str_pad($dnsname, 30)." $real_hostname\n"); $dns_list[] = str_pad($revzone, 24) . "|" . str_pad($reverse, 30)."IN ADDR ".str_pad($dnsname, 30);
}
sort ($dns_list);
foreach ($dns_list as $entry) {
list($zone, $entry) = explode("|", $entry);
$zone = trim($zone);
if($zone != $oldzone) { echo("\n$$zone\n------------------------------\n"); }
echo("$entry \n");
$oldzone = $zone;
} }
includes/common.php
-22
View File
@@ -1,22 +0,0 @@
<?php
$config['version'] = "0.3.3";
### Connect to database
if (!@mysql_connect($config['db_host'], $config['db_user'], $config['db_pass'])) {
echo "<h2>MySQL Error</h2>";
die;
}
mysql_select_db($config['db_name']);
# Set some times needed by loads of scripts (it's dynamic, so we do it here!)
$now = time();
$day = time() - (24 * 60 * 60);
$twoday = time() - (2 * 24 * 60 * 60);
$week = time() - (7 * 24 * 60 * 60);
$month = time() - (31 * 24 * 60 * 60);
$year = time() - (365 * 24 * 60 * 60);
?>
includes/functions.php
-1
View File
@@ -7,7 +7,6 @@ include_once("Net/IPv6.php");
## Observer Includes ## Observer Includes
include_once($config['install_dir'] . "/includes/common.php");
include_once($config['install_dir'] . "/includes/generic.php"); include_once($config['install_dir'] . "/includes/generic.php");
include_once($config['install_dir'] . "/includes/ios.php"); include_once($config['install_dir'] . "/includes/ios.php");
include_once($config['install_dir'] . "/includes/unix.php"); include_once($config['install_dir'] . "/includes/unix.php");
includes/polling/interfaces.inc.php
+13 -10
View File
@@ -32,21 +32,24 @@ while ($interface = mysql_fetch_array($interface_query)) {
$ifAlias = trim(str_replace("\"", "", $ifAlias)); $ifAlias = trim(str_replace("\"", "", $ifAlias));
$ifAlias = trim($ifAlias); $ifAlias = trim($ifAlias);
$old_rrdfile = "rrd/" . $device['hostname'] . "." . $interface['ifIndex'] . ".rrd"; $older_rrdfile = "rrd/" . $device['hostname'] . "." . $interface['ifIndex'] . ".rrd";
$rrdfile = $host_rrd . "/" . $interface['ifIndex'] . ".rrd"; $rrdfile = $host_rrd . "/" . $interface['ifIndex'] . ".rrd";
if(is_file($old_rrdfile) && !is_file($rrdfile)) { rename($old_rrdfile, $rrdfile); echo("Moving $old_rrdfile to $rrdfile"); } if(is_file($older_rrdfile) && !is_file($rrdfile)) { rename($older_rrdfile, $rrdfile); echo("Moving $older_rrdfile to $rrdfile"); }
if(!is_file($rrdfile)) { if(!is_file($rrdfile)) {
$woo = `rrdtool create $rrdfile \ $woo = `rrdtool create $rrdfile \
DS:INOCTETS:COUNTER:600:0:18446744073709551615 \ DS:INOCTETS:COUNTER:600:0:12500000000 \
DS:OUTOCTETS:COUNTER:600:0:18446744073709551615 \ DS:OUTOCTETS:COUNTER:600:0:12500000000 \
DS:INERRORS:COUNTER:600:0:18446744073709551615 \ DS:INERRORS:COUNTER:600:0:12500000000 \
DS:OUTERRORS:COUNTER:600:0:18446744073709551615 \ DS:OUTERRORS:COUNTER:600:0:12500000000 \
DS:INUCASTPKTS:COUNTER:600:0:18446744073709551615 \ DS:INUCASTPKTS:COUNTER:600:0:12500000000 \
DS:OUTUCASTPKTS:COUNTER:600:0:18446744073709551615 \ DS:OUTUCASTPKTS:COUNTER:600:0:12500000000 \
DS:INNUCASTPKTS:COUNTER:600:0:18446744073709551615 \ DS:INNUCASTPKTS:COUNTER:600:0:12500000000 \
DS:OUTNUCASTPKTS:COUNTER:600:0:18446744073709551615 \ DS:OUTNUCASTPKTS:COUNTER:600:0:12500000000 \
RRA:AVERAGE:0.5:1:600 \ RRA:AVERAGE:0.5:1:600 \
RRA:AVERAGE:0.5:6:700 \ RRA:AVERAGE:0.5:6:700 \
RRA:AVERAGE:0.5:24:775 \ RRA:AVERAGE:0.5:24:775 \