some sensor unification, rename sensor rrds and rename the DS, add testing IPMI support (no web-part yet) - tested against Intel RMM3 and working. some further cleanups as well.

git-svn-id: http://www.observium.org/svn/observer/trunk@1758 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2010-12-15 17:54:42 +00:00
parent 500ed09299
commit 06d2a707d5
25 changed files with 293 additions and 182 deletions

View File

@@ -45,10 +45,10 @@ if (isset($options['d'])) {
ini_set('error_reporting', 1);
} else {
$debug = FALSE;
ini_set('display_errors', 0);
# ini_set('display_errors', 0);
ini_set('display_startup_errors', 0);
ini_set('log_errors', 0);
ini_set('error_reporting', 0);
# ini_set('error_reporting', 0);
}
@@ -79,22 +79,26 @@ if (file_exists('.svn'))
$db_rev = 0;
}
if ($db_rev+0 < "1223") {
if ($db_rev+0 < 1223) {
include("fix-events.php"); ## Fix events table (needs to copy some data around, so needs script)
}
if($db_rev+0 < 1656) {
if ($db_rev+0 < 1656) {
include('fix-port-rrd.php'); ## Rewrites all port RRDs. Nothing will work without this after 1656
}
if ($db_rev+0 < 1757) {
include('fix-sensor-rrd.php'); ## Rewrites all sensor RRDs. Nothing will work without this after 1757
}
if ($dbu_rev+0 > $db_rev)
{
echo("SVN revision changed.\n");
if($db_rev+0 < "1000") {
if ($db_rev+0 < "1000") {
echo("Running pre-revision 1000 SQL update script...\n");
shell_exec("scripts/update-sql.php database-update-pre1000.sql");
}
if($db_rev+0 < "1435") {
if ($db_rev+0 < "1435") {
echo("Running pre-revision 1435 SQL update script...\n");
shell_exec("scripts/update-sql.php database-update-pre1435.sql");
}