space/indent fixes and cleanups

git-svn-id: http://www.observium.org/svn/observer/trunk@1849 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-15 15:10:23 +00:00
parent 1ff3eb6632
commit 0cbb3ab944
6 changed files with 34 additions and 25 deletions

2
README
View File

@@ -1,4 +1,4 @@
Copyright (C) 2006-2010 Adam Armstrong <adama@memetic.org> Copyright (C) 2006-2011 Adam Armstrong <adama@memetic.org>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

View File

@@ -7,14 +7,17 @@ include("includes/functions.php");
## Check all of our interface RRD files for errors ## Check all of our interface RRD files for errors
if($argv[1]) { $where = "AND `interface_id` = '$argv[1]'"; } if ($argv[1]) { $where = "AND `interface_id` = '$argv[1]'"; }
$i = '0'; $i = '0';
$interface_query = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.device_id = D.device_id $where"); $interface_query = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.device_id = D.device_id $where");
while ($interface = mysql_fetch_array($interface_query)) {
while ($interface = mysql_fetch_array($interface_query))
{
$errors = $interface['ifInErrors_delta'] + $interface['ifOutErrors_delta']; $errors = $interface['ifInErrors_delta'] + $interface['ifOutErrors_delta'];
if($errors > '1') { if ($errors > '1')
{
$errored[] = $interface['hostname'] . " - " . $interface['ifDescr'] . " - " . $interface['ifAlias'] . " - " . $interface['ifInErrors_delta'] . " - " . $interface['ifOutErrors_delta']; $errored[] = $interface['hostname'] . " - " . $interface['ifDescr'] . " - " . $interface['ifAlias'] . " - " . $interface['ifInErrors_delta'] . " - " . $interface['ifOutErrors_delta'];
} }
$i++; $i++;
@@ -22,10 +25,13 @@ while ($interface = mysql_fetch_array($interface_query)) {
echo("Checked $i Interfaces\n"); echo("Checked $i Interfaces\n");
if($errored) { ## If there are errored ports if ($errored)
{ ## If there are errored ports
$i=0; $i=0;
$msg = "Interfaces with errors : \n\n"; $msg = "Interfaces with errors : \n\n";
foreach ($errored as $int) {
foreach ($errored as $int)
{
$msg .= "$int\n"; ## Add a line to the report email warning about them $msg .= "$int\n"; ## Add a line to the report email warning about them
$i++; $i++;
} }

View File

@@ -7,17 +7,19 @@ include("includes/functions.php");
# Remove a host and all related data from the system # Remove a host and all related data from the system
if($argv[1]) { if ($argv[1])
{
$host = strtolower($argv[1]); $host = strtolower($argv[1]);
$id = getidbyname($host); $id = getidbyname($host);
if($id) { if ($id)
{
echo(delete_device($id)); echo(delete_device($id));
echo("Removed $host\n"); echo("Removed $host\n");
} else { } else {
echo("Host doesn't exist!\n"); echo("Host doesn't exist!\n");
} }
} else { } else {
echo("Host Removal Tool\nUsage: ./delhost.php <hostname>\n"); echo("Host Removal Tool\nUsage: ./delhost.php <hostname>\n");
} }
?> ?>

View File

@@ -5,15 +5,16 @@ mysql_query("ALTER TABLE `eventlog` ADD `event_id` INT NOT NULL AUTO_INCREMENT
$s = "SELECT * FROM eventlog"; $s = "SELECT * FROM eventlog";
$q = mysql_query($s); $q = mysql_query($s);
while ($event = mysql_fetch_array($q)) { while ($event = mysql_fetch_array($q))
{
if($event['interface']) { if ($event['interface'])
{
mysql_query("UPDATE `eventlog` SET `interface` = NULL, `type` = 'interface', `reference` = '".$event['interface']."' WHERE `event_id` = '".$event['event_id']."'"); mysql_query("UPDATE `eventlog` SET `interface` = NULL, `type` = 'interface', `reference` = '".$event['interface']."' WHERE `event_id` = '".$event['event_id']."'");
} }
$i++; $i++;
} }
mysql_query("ALTER TABLE `eventlog` DROP `interface`"); mysql_query("ALTER TABLE `eventlog` DROP `interface`");
?> ?>

View File

@@ -7,11 +7,11 @@ include("includes/functions.php");
# Remove a host and all related data from the system # Remove a host and all related data from the system
if($argv[1] && $argv[2]) if ($argv[1] && $argv[2])
{ {
$host = strtolower($argv[1]); $host = strtolower($argv[1]);
$id = getidbyname($host); $id = getidbyname($host);
if($id) if ($id)
{ {
renamehost($id, $argv[2]); renamehost($id, $argv[2]);
echo("Renamed $host\n"); echo("Renamed $host\n");