Revision: 1049
http://pandora.svn.sourceforge.net/pandora/?rev=1049&view=rev
Author: slerena
Date: 2008-09-01 04:22:26 +0000 (Mon, 01 Sep 2008)
Log Message:
-----------
2008-09-01 Sancho lerena <slerena@...>
* include/, fgraph.php: Moved licence of libraries to LGPL.
* install.php: Added dependency check for several new includes
from pear (xml_rpc and DB), also graphviz twopi binary and check
in step1 for a writable config.php and ./include dir. Some other
minor fixes (esthetic).
* pandoradb.sql: Table tagent_data_image was still there. This
comes with next version (I hope), not this one.
* pandoradb_data.sql: db_scheme_build update and removed modules
components without proper id_module.
* networkmap.php: Another foreach() notice fixed.
* upgrade.php: Moved to contrib branch in SVN.
Old pandora SQL conversion files, deleted (was present in its branches).
Modified Paths:
--------------
trunk/pandora_console/ChangeLog
trunk/pandora_console/include/functions.php
trunk/pandora_console/include/functions_db.php
trunk/pandora_console/include/functions_extensions.php
trunk/pandora_console/include/functions_html.php
trunk/pandora_console/include/functions_reporting.php
trunk/pandora_console/include/functions_reporting_pdf.php
trunk/pandora_console/include/functions_visual_map.php
trunk/pandora_console/install.php
trunk/pandora_console/operation/agentes/networkmap.php
trunk/pandora_console/pandoradb.sql
trunk/pandora_console/pandoradb_data.sql
trunk/pandora_console/reporting/fgraph.php
Added Paths:
-----------
branches/contrib/upgrade.php
Removed Paths:
-------------
trunk/pandora_console/pandoradb_12_to_13.sql
trunk/pandora_console/pandoradbdata_12_to_13.sql
trunk/pandora_console/upgrade.php
Copied: branches/contrib/upgrade.php (from rev 1048, trunk/pandora_console/upgrade.php)
===================================================================
--- branches/contrib/upgrade.php (rev 0)
+++ branches/contrib/upgrade.php 2008-09-01 04:22:26 UTC (rev 1049)
@@ -0,0 +1,477 @@
+<?php
+
+// Pandora FMS - the Flexible Monitoring System
+// ============================================
+// Copyright (c) 2008 Artica Soluciones Tecnologicas, http://www.artica.es
+// Please see http://pandora.sourceforge.net for full contribution list
+
+// 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 the Free Software Foundation for version 2.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<title>Pandora FMS - Upgrade Wizard</title>
+<meta http-equiv="expires" content="0">
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="author" content="Sancho Lerena, Raul Mateos">
+<meta name="copyright" content="This is GPL software. Created by Sancho Lerena and others">
+<meta name="keywords" content="pandora, fms, monitoring, network, system, GPL, software">
+<meta name="robots" content="index, follow">
+<link rel="icon" href="images/pandora.ico" type="image/ico">
+<link rel="stylesheet" href="include/styles/pandora_minimal.css" type="text/css">
+<link rel="stylesheet" href="include/styles/install.css" type="text/css">
+</head>
+
+<body>
+<?php
+
+echo "<h1>INSTALLER IS NOT WORKING YET. PLEASE DO NOT USE</h1>";
+exit;
+
+error_reporting(0);
+
+function check_extension ( $ext, $label ){
+ echo "<tr><td>";
+ echo "<span class='arr'> $label </span>";
+ echo "</td><td>";
+ if (!extension_loaded($ext)){
+ echo "<img src='images/dot_red.png'>";
+ return 1;
+ } else {
+ echo "<img src='images/dot_green.png'>";
+ return 0;
+ }
+ echo "</td></tr>";
+}
+
+function check_include ( $ext, $label ){
+ echo "<tr><td>";
+ echo "<span class='arr'> $label </span>";
+ echo "</td><td>";
+ if (!include($ext)){
+ echo "<img src='images/dot_red.png'>";
+ return 1;
+ } else {
+ echo "<img src='images/dot_green.png'>";
+ return 0;
+ }
+ echo "</td></tr>";
+}
+
+function check_exists ( $file, $label ){
+ echo "<tr><td>";
+ echo "<span class='arr'> $label </span>";
+ echo "</td><td>";
+ if (!file_exists ($file)){
+ echo " <img src='images/dot_red.png'>";
+ return 1;
+ } else {
+ echo " <img src='images/dot_green.png'>";
+ return 0;
+ }
+ echo "</td></tr>";
+}
+
+function check_generic ( $ok, $label ){
+ echo "<tr><td>";
+ echo "<span class='arr'> $label </span>";
+ echo "</td><td>";
+ if ($ok == 0 ){
+ echo " <img src='images/dot_red.png'>";
+ return 1;
+ } else {
+ echo " <img src='images/dot_green.png'>";
+ return 0;
+ }
+ echo "</td></tr>";
+}
+
+function check_variable ( $var, $value, $label, $mode ){
+ echo "<tr><td>";
+ echo "<span class='arr'> $label </span>";
+ echo "</td><td>";
+ if ($mode == 1){
+ if ($var >= $value){
+ echo " <img src='images/dot_green.png'>";
+ return 0;
+ } else {
+ echo " <img src='images/dot_red.png'>";
+ return 1;
+ }
+ } elseif ($var == $value){
+ echo " <img src='images/dot_green.png'>";
+ return 0;
+ } else {
+ echo " <img src='images/dot_red.png'>";
+ return 1;
+ }
+ echo "</td></tr>";
+}
+
+function migrate_data (){
+
+ check_generic (1, "Updating tagente_datos table");
+ $sql1="SELECT * FROM tagente_datos WHERE utimestamp = 0 ";
+ $result1=mysql_query($sql1);
+ while ($row1=mysql_fetch_array($result1)){
+ $id = $row1["id_agente_datos"];
+ $timestamp = $row1["timestamp"];
+ $utimestamp = strtotime($timestamp);
+ $sql2="UPDATE tagente_datos SET utimestamp = '$utimestamp' WHERE id_agente_datos = $id";
+ mysql_query($sql2);
+ }
+ flush();
+
+ check_generic (1,"Updating tagente_datos_string table");
+ $sql1="SELECT * FROM tagente_datos_string WHERE utimestamp = 0 ";
+ $result1=mysql_query($sql1);
+ while ($row1=mysql_fetch_array($result1)){
+ $id = $row1["id_tagente_datos_string"];
+ $timestamp = $row1["timestamp"];
+ $utimestamp = strtotime($timestamp);
+ $sql2="UPDATE tagente_datos SET utimestamp = '$utimestamp' WHERE id_tagente_datos_string = $id";
+ mysql_query($sql2);
+ }
+ flush();
+
+ check_generic (1,"Updating tagente_estado table");
+ $sql1="SELECT * FROM tagente_estado WHERE utimestamp = 0";
+ $result1=mysql_query($sql1);
+ while ($row1=mysql_fetch_array($result1)){
+ $id = $row1["id_agente_estado"];
+ $timestamp = $row1["timestamp"];
+ $utimestamp = strtotime($timestamp);
+ $sql2="UPDATE tagente_estado SET utimestamp = '$utimestamp', last_execution_try = '$utimestamp' WHERE id_agente_estado = $id";
+ mysql_query($sql2);
+ }
+
+}
+
+function parse_mysql_dump($url){
+ if (file_exists($url)){
+ $file_content = file($url);
+ $query = "";
+ foreach($file_content as $sql_line){
+ if(trim($sql_line) != "" && strpos($sql_line, "--") === false){
+ $query .= $sql_line;
+ if(preg_match("/;[\040]*\$/", $sql_line)){
+ if (!$result = mysql_query($query))
+ return 0;
+ $query = "";
+ }
+ }
+ }
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
+function random_name ($size){
+ $temp = "";
+ for ($a=0;$a< $size;$a++)
+ $temp = $temp. chr(rand(122,97));
+ return $temp;
+}
+
+function install_step1() {
+ echo "
+ <div id='install_container'>
+ <h1>Pandora FMS upgrade wizard. Step #1 of 5</h1>
+ <div id='wizard' style='height: 390px;'>
+ <div id='install_box'>
+ <h1>Welcome to Pandora FMS 1.3 upgrade Wizard</h1>
+ <p>This wizard helps you to quick upgrade Pandora FMS console in your system. This tool is <b>only</b> to
+upgrade Pandora FMS 1.2 to Pandora FMS 1.3</p>
+ <p>For more information, please refer to documentation.</p>
+ <i>Pandora FMS Development Team</i>
+ <div class='info'>Before start with upgrade process. Please <b>STOP NOW all your Pandora FMS</b></div>";
+
+ if (file_exists("include/config.php")){
+ echo "<div class='warn'><b>Warning:</b> You already have a config.php file in this directory, please backup and move it before continue.</div>";
+ }
+ echo "<div class='warn'><b>Warning:</b> This upgrade tool will <b>overwrite and change</b> your existing Pandora FMS
+<b>Database</b> and only could be used to upgrade fron Pandora FMS 1.2 to Pandora FMS 1.3. Before continue, please <b>be sure that you
+have made a SQL backup using mysqldump system tool as described in documentation.</b><br></div>";
+ echo "
+ </div>
+ <div id='logo_img'>
+ <img src='images/pandora_logo.png' border='0'><br>
+ <img src='images/step0.png' border='0'>
+ </div>
+ <div id='install_img'>
+ <a href='upgrade.php?step=2'><img align='right' src='images/arrow_next.png' border=0></a>
+ </div>
+ </div>
+ <div id='foot_install'>
+ <i>Pandora FMS is a Free Software project registered at <a target='_new' href='http://pandora.sourceforge.net'>SourceForge</a></i>
+ </div>
+ </div>";
+}
+
+
+function install_step2() {
+ echo "
+ <div id='install_container'>
+ <h1>Pandora FMS upgrade wizard. Step #2 of 5</h1>
+ <div id='wizard' style='height: 340px;'>
+ <div id='install_box'>";
+ echo "<h1>Checking software dependencies</h1>";
+ echo "<table border=0 width=230>";
+ $res = 0;
+ $res += check_variable(phpversion(),"4.3","PHP version >= 4.3.x",1);
+ $res += check_extension("mysql","PHP MySQL extension");
+ //$res += check_extension("curl","PHP Curl extension");
+ $res += check_extension("gd","PHP gd extension");
+ $res += check_extension("snmp","PHP SNMP extension");
+ $res += check_extension("session","PHP session extension");
+ $res += check_include("PEAR.php","PEAR PHP Library");
+ $step6 = is_writable("include");
+ check_generic ($step6, "Write permissions to save config file in './include'");
+ if ($step6 == 0)
+ $res++;
+
+ //$res += check_exists ("/usr/bin/pdflatex","PDF Latex in /usr/bin/pdflatex");
+ echo "</table>
+ </div>
+ <div id='logo_img'>
+ <img src='images/pandora_logo.png' border='0' alt=''><br>
+ <img src='images/step1.png' border='0' alt=''>
+ </div>
+ <div id='install_img'>";
+ if ($res > 0) {
+ echo "<div class='warn'>You have some uncomplete
+ dependencies. Please correct them or this wizard tool
+ will not be able to finish your installation.
+ </div><br>
+ Ignore it. <a href='upgrade.php?step=3'>Ignore it and go to Step #3</a>";
+ } else {
+ echo "<a href='upgrade.php?step=3'><img align='right' src='images/arrow_next.png' border=0 alt=''></a>";
+ }
+ echo "
+ </div>
+ </div>
+ <div id='foot_install'>
+ <i>Pandora FMS is a Free Software project registered at
+ <a target='_new' href='http://pandora.sourceforge.net'>SourceForge</a></i>
+ </div>
+ </div>";
+}
+
+
+function install_step3() {
+ echo "
+ <div id='install_container'>
+ <h1>Pandora FMS upgrade wizard. Step #3 of 5 </h1>
+ <div id='wizard' style='height: 520px;'>
+ <div id='install_box'>
+ <h1>Environment and database setup</h1>
+ <p>
+ This wizard will transform your Pandora FMS database, and populate it with all the data needed to run for the first time, modifying existing data to be used by the new version.
+ </p>
+ <p>
+ You need a user to modify and create database schema, this is usually the existant <b>pandora</b> user, you could check on config.php file of Pandora FMS 1.2 installation.
+ </p>";
+ echo "<form method='post' action='upgrade.php?step=4'>
+ <div>DB User with privileges on MySQL</div>
+ <input class='login' type='text' name='user' value='pandora'>
+
+ <div>DB Password for this user</div>
+ <input class='login' type='password' name='pass' value=''>
+
+ <div>DB Hostname of MySQL</div>
+ <input class='login' type='text' name='host' value='localhost'>
+
+ <div>DB Name (pandora by default)</div>
+ <input class='login' type='text' name='dbname' value='pandora'>
+
+ <div>Full path to HTTP publication directory<br>
+ <span class='f9b'>For example /var/www/pandora_console/. Needed for graphs and attachments.</span>
+ </div>
+ <input class='login' type='text' name='path' style='width: 190px;' value='/var/www/pandora_console/'>
+
+ <div>Full local URL to Pandora FMS Console<br>
+ <span class='f9b'>For example http://localhost/pandora_console</span>
+ </div>
+ <input class='login' type='text' name='url' style='width: 250px;' value='http://localhost/pandora_console'>
+
+ <div align='right'><input type='image' src='images/arrow_next.png' value='Step #4' id='step4'></div>
+ </form>
+ </div>
+ <div id='logo_img'>
+ <img src='images/pandora_logo.png' border='0' alt=''><br>
+ <img src='images/step2.png' border='0' alt=''>
+ </div>
+ </div>
+ <div id='foot_install'>
+ <i>Pandora FMS is a Free Software project registered at
+ <a target='_new' href='http://pandora.sourceforge.net'>SourceForge</a></i>
+ </div>
+ </div>";
+}
+
+
+function install_step4() {
+ $pandora_config = "include/config.php";
+
+ if ( (! isset($_POST["user"])) || (! isset($_POST["dbname"])) || (! isset($_POST["host"])) || (! isset($_POST["pass"])) ) {
+ $dbpassword = "";
+ $dbuser = "";
+ $dbhost = "";
+ $dbname = "";
+ } else {
+ $dbpassword = $_POST["pass"];
+ $dbuser = $_POST["user"];
+ $dbhost = $_POST["host"];
+ $dbname = $_POST["dbname"];
+ if (isset($_POST["url"]))
+ $url = $_POST["url"];
+ else
+ $url = "http://localhost";
+ if (isset($_POST["path"]))
+ $path = $_POST["path"];
+ else
+ $path = "/var/www";
+ }
+ $everything_ok = 0;
+ $step1=0; $step2=0; $step3=0;
+ $step4=0; $step5=0; $step6=0; $step7=0;
+ echo "<div id='install_container'>
+ <h1>Pandora FMS upgrade wizard. Step #4 of 5</h1>
+ <div id='wizard' style='height: 540px;'>
+ <div id='install_box'>
+ <h1>Modifing database schema and adding data</h1>This could take a while... please wait</h2>
+ <table>";
+ if (! mysql_connect ($dbhost,$dbuser,$dbpassword)) {
+ check_generic ( 0, "Connection with Database");
+ } else {
+ check_generic ( 1, "Connection with Database");
+ // Create schema
+ if (mysql_select_db($dbname))
+ $step2 = 1;
+ else
+ $step2 = 0;
+ check_generic ($step2, "Opening database '$dbname'");
+ flush();
+ $step3 = (parse_mysql_dump("pandoradb_12_to_13.sql"));
+ check_generic ($step3, "Schema manipulation");
+ flush();
+ $step4 = parse_mysql_dump("pandoradbdata_12_to_13.sql");
+ check_generic ($step4, "Populating new schema and converting data");
+ flush();
+ $cfgin = fopen ("include/config.inc.php","r");
+ $cfgout = fopen ($pandora_config,"w");
+ $config_contents = fread ($cfgin, filesize("include/config.inc.php"));
+
+ $config_new = '<?php
+// Begin of automatic config file
+$dbname="'.$dbname.'"; // MySQL DataBase name
+$dbuser="'.$dbuser.'"; // DB User
+$dbpassword="'.$dbpassword.'"; // DB Password
+$dbhost="'.$dbhost.'"; // DB Host
+$config_homedir="'.$path.'"; // Config homedir
+$BASE_URL="'.$url.'"; // Base URL
+// End of automatic config file
+?>';
+ $step5 = fputs ($cfgout, $config_new);
+ $step5 = $step5 + fputs ($cfgout, $config_contents);
+ if ($step5 > 0)
+ $step5 = 1;
+ fclose ($cfgin);
+ fclose ($cfgout);
+ chmod ($pandora_config, 0600);
+ check_generic ($step5, "Created new config file at '".$pandora_config."'");
+
+ }
+ if (($step5 + $step4 + $step3 + $step2 ) == 4) {
+ $everything_ok = 1;
+ migrate_data();
+ }
+
+ echo "</table></div>
+ <div id='logo_img'>
+ <img src='images/pandora_logo.png' border='0' alt=''><br>
+ <img src='images/step3.png' border='0' alt=''>
+ </div>
+
+ <div id='install_img'>";
+ if ($everything_ok == 1) {
+ echo "<br><br><a href='upgrade.php?step=5'><img align='right' src='images/arrow_next.png' border='0' alt=''></a>";
+ } else {
+ echo "<div class='warn'><b>There was some problems. Installation is not completed.</b>
+ <p>Please correct failures, and restore original DB before trying again.</div>";
+
+ if (mysql_error() != "")
+ echo "<div class='warn'> <b>ERROR:</b> ". mysql_error().".</div>";
+ }
+ echo "
+ </div>
+ </div>
+ <div id='foot_install'>
+ <i>Pandora FMS is a Free Software project registered at
+ <a target='_new' href='http://pandora.sourceforge.net'>SourceForge</a></i>
+ </div>
+</div>";
+
+}
+
+function install_step5() {
+ echo "
+ <div id='install_container'>
+ <h1>Pandora FMS upgrade wizard. Finished</h1>
+ <div id='wizard' style='height: 300px;'>
+ <div id='install_box'>
+ <h1>Upgrade complete!</h1>
+ <p>You now must delete manually installer and upgrade tool ('<i>install.php</i>, <i>upgrade.php</i>') files for security before trying to access to your Pandora FMS console.
+ <p>Don't forget to check <a href='http://pandora.sourceforge.net'>http://pandora.sourceforge.net</a> for updates.
+ <p><a href='index.php'>Click here to access to your Pandora FMS console</a></p>
+ </div>
+ <div id='logo_img'>
+ <img src='images/pandora_logo.png' border='0'><br>
+ <img src='images/step4.png' border='0'><br>
+ </div>
+ </div>
+ <div id='foot_install'>
+ <i>Pandora FMS is a Free Software project registered at
+ <a target='_new' href='http://pandora.sourceforge.net'>SourceForge</a></i>
+ </div>
+</div>";
+}
+
+
+// ---------------
+// Main page code
+// ---------------
+
+if (! isset($_GET["step"])){
+ install_step1();
+} else {
+ $step = $_GET["step"];
+ switch ($step) {
+ case 2: install_step2();
+ break;
+ case 3: install_step3();
+ break;
+ case 4: install_step4();
+ break;
+ case 5: install_step5();
+ break;
+ case 6: install_step6();
+ break;
+ }
+}
+
+?>
+</body>
+</html>
Modified: trunk/pandora_console/ChangeLog
===================================================================
--- trunk/pandora_console/ChangeLog 2008-08-29 16:05:08 UTC (rev 1048)
+++ trunk/pandora_console/ChangeLog 2008-09-01 04:22:26 UTC (rev 1049)
@@ -1,3 +1,24 @@
+2008-09-01 Sancho lerena <slerena@...>
+
+ * include/, fgraph.php: Moved licence of libraries to LGPL.
+
+ * install.php: Added dependency check for several new includes
+ from pear (xml_rpc and DB), also graphviz twopi binary and check
+ in step1 for a writable config.php and ./include dir. Some other
+ minor fixes (esthetic).
+
+ * pandoradb.sql: Table tagent_data_image was still there. This
+ comes with next version (I hope), not this one.
+
+ * pandoradb_data.sql: db_scheme_build update and removed modules
+ components without proper id_module.
+
+ * networkmap.php: Another foreach() notice fixed.
+
+ * upgrade.php: Moved to contrib branch in SVN.
+
+ Old pandora SQL conversion files, deleted (was present in its branches).
+
2008-08-28 Evi Vanoost <vanooste@...>
* operation/events/events.php: Updated the queries and fixed some minor
Modified: trunk/pandora_console/include/functions.php
===================================================================
--- trunk/pandora_console/include/functions.php 2008-08-29 16:05:08 UTC (rev 1048)
+++ trunk/pandora_console/include/functions.php 2008-09-01 04:22:26 UTC (rev 1049)
@@ -6,8 +6,9 @@
// Please see http://pandora.sourceforge.net for full contribution list
// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
+// modify it under the terms of the GNU Lesser General Public License (LGPL)
// as published by the Free Software Foundation for version 2.
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Modified: trunk/pandora_console/include/functions_db.php
===================================================================
--- trunk/pandora_console/include/functions_db.php 2008-08-29 16:05:08 UTC (rev 1048)
+++ trunk/pandora_console/include/functions_db.php 2008-09-01 04:22:26 UTC (rev 1049)
@@ -6,8 +6,9 @@
// Please see http://pandora.sourceforge.net for full contribution list
// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
+// modify it under the terms of the GNU Lesser General Public License (LGPL)
// as published by the Free Software Foundation for version 2.
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -23,6 +24,7 @@
*
* @return 0 on success
*/
+
function check_login () {
global $config;
if (! isset ($config["homedir"])) {
Modified: trunk/pandora_console/include/functions_extensions.php
===================================================================
--- trunk/pandora_console/include/functions_extensions.php 2008-08-29 16:05:08 UTC (rev 1048)
+++ trunk/pandora_console/include/functions_extensions.php 2008-09-01 04:22:26 UTC (rev 1049)
@@ -6,8 +6,9 @@
// Please see http://pandora.sourceforge.net for full contribution list
// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
+// modify it under the terms of the GNU Lesser General Public License (LGPL)
// as published by the Free Software Foundation for version 2.
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Modified: trunk/pandora_console/include/functions_html.php
===================================================================
--- trunk/pandora_console/include/functions_html.php 2008-08-29 16:05:08 UTC (rev 1048)
+++ trunk/pandora_console/include/functions_html.php 2008-09-01 04:22:26 UTC (rev 1049)
@@ -6,8 +6,9 @@
// Please see http://pandora.sourceforge.net for full contribution list
// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
+// modify it under the terms of the GNU Lesser General Public License (LGPL)
// as published by the Free Software Foundation for version 2.
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Modified: trunk/pandora_console/include/functions_reporting.php
===================================================================
--- trunk/pandora_console/include/functions_reporting.php 2008-08-29 16:05:08 UTC (rev 1048)
+++ trunk/pandora_console/include/functions_reporting.php 2008-09-01 04:22:26 UTC (rev 1049)
@@ -6,8 +6,9 @@
// Please see http://pandora.sourceforge.net for full contribution list
// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
+// modify it under the terms of the GNU Lesser General Public License (LGPL)
// as published by the Free Software Foundation for version 2.
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Modified: trunk/pandora_console/include/functions_reporting_pdf.php
===================================================================
--- trunk/pandora_console/include/functions_reporting_pdf.php 2008-08-29 16:05:08 UTC (rev 1048)
+++ trunk/pandora_console/include/functions_reporting_pdf.php 2008-09-01 04:22:26 UTC (rev 1049)
@@ -6,8 +6,9 @@
// Please see http://pandora.sourceforge.net for full contribution list
// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
+// modify it under the terms of the GNU Lesser General Public License (LGPL)
// as published by the Free Software Foundation for version 2.
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Modified: trunk/pandora_console/include/functions_visual_map.php
===================================================================
--- trunk/pandora_console/include/functions_visual_map.php 2008-08-29 16:05:08 UTC (rev 1048)
+++ trunk/pandora_console/include/functions_visual_map.php 2008-09-01 04:22:26 UTC (rev 1049)
@@ -6,8 +6,9 @@
// Please see http://pandora.sourceforge.net for full contribution list
// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
+// modify it under the terms of the GNU Lesser General Public License (LGPL)
// as published by the Free Software Foundation for version 2.
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Modified: trunk/pandora_console/install.php
===================================================================
--- trunk/pandora_console/install.php 2008-08-29 16:05:08 UTC (rev 1048)
+++ trunk/pandora_console/install.php 2008-09-01 04:22:26 UTC (rev 1049)
@@ -94,6 +94,29 @@
echo "</td></tr>";
}
+function check_writable ( $fullpath, $label ){
+ echo "<tr><td>";
+ echo "<span class='arr'> $label </span>";
+ echo "</td><td>";
+ if (file_exists($fullpath))
+ if (is_writable($fullpath)){
+ echo " <img src='images/dot_green.png'>";
+ echo "</td></tr>";
+ return 0;
+ } else {
+ echo " <img src='images/dot_red.png'>";
+ echo "</td></tr>";
+ return 1;
+ }
+ else {
+ echo " <img src='images/dot_red.png'>";
+ echo "</td></tr>";
+ return 1;
+ }
+
+}
+
+
function check_variable ( $var, $value, $label, $mode ){
echo "<tr><td>";
echo "<span class='arr'> $label </span>";
@@ -150,7 +173,7 @@
echo "
<div id='install_container'>
<h1>Pandora FMS installation wizard. Step #1 of 4</h1>
- <div id='wizard' style='height: 380px;'>
+ <div id='wizard' style='height: 490px;'>
<div id='install_box'>
<h2>Welcome to Pandora FMS 2.0 installation Wizard</h2>
<p>This wizard helps you to quick install Pandora FMS console in your system.</p>
@@ -163,6 +186,12 @@
echo "<div class='warn'><b>Warning:</b> You already have a config.php file.
Configuration and database would be overwritten if you continued.</div>";
}
+ echo "<table width=100%>";
+ $writable = check_writable ( "include", "Checking if ./config is writable");
+ if (file_exists("include/config.php"))
+ $writable += check_writable ( "include/config.php", "Checking if include/config.php is writable");
+ echo "</table>";
+
echo "<div class='warn'><b>Warning:</b> This installer will <b>overwrite and destroy</b>
your existing Pandora FMS configuration and <b>Database</b>. Before continue,
please <b>be sure that you have no valuable Pandora FMS data in your Database</b>.<br>
@@ -179,13 +208,17 @@
<img src='images/pandora_logo.png' border='0'><br>
<img src='images/step0.png' border='0'>
</div>
- <div id='install_img'>
- <a href='install.php?step=2'><img align='right' src='images/arrow_next.png' border='0'>
- </a>
+ <div id='install_img'>";
+ if ($writable == 0)
+ echo "
+ <a href='install.php?step=2'><img align='right' src='images/arrow_next.png' border='0'></a>";
+ else
+ echo "<div class='warn'><b>ERROR:</b>You need to setup permissions to be able to write in ./include directory</div>";
+ echo "
</div>
</div>
<div id='foot_install'>
- <i>Pandora FMS is a Free Software project registered at
+ <i>Pandora FMS is an OpenSource Software project registered at
<a target='_new' href='http://pandora.sourceforge.net'>SourceForge</a></i>
</div>
</div>";
@@ -196,7 +229,7 @@
echo "
<div id='install_container'>
<h1>Pandora FMS console installation wizard. Step #2 of 4</h1>
- <div id='wizard' style='height: 300px;'>
+ <div id='wizard' style='height: 390px;'>
<div id='install_box'>";
echo "<h2>Checking software dependencies</h2>";
echo "<table border=0 width=230>";
@@ -208,7 +241,10 @@
$res += check_extension("session","PHP session extension");
$res += check_extension("gettext","PHP gettext extension");
$res += check_include("PEAR.php","PEAR PHP Library");
- //$res += check_exists ("/usr/bin/pdflatex","PDF Latex in /usr/bin/pdflatex");
+ $res += check_include("DB.php","PEAR:DB PHP Library");
+ $res += check_include("XML/RPC.php","PEAR XML/RPC.php PHP Library");
+ $res += check_exists ("/usr/bin/twopi","Graphviz Binary");
+
echo "</table>
</div>
<div id='logo_img'>
@@ -231,7 +267,7 @@
</div>
</div>
<div id='foot_install'>
- <i>Pandora FMS is a Free Software project registered at
+ <i>Pandora FMS is an OpenSource Software project registered at
<a target='_new' href='http://pandora.sourceforge.net'>SourceForge</a></i>
</div>
</div>";
@@ -300,7 +336,7 @@
</div>
</div>
<div id='foot_install'>
- <i>Pandora FMS is a Free Software project registered at
+ <i>Pandora FMS is an OpenSource Software project registered at
<a target='_new' href='http://pandora.sourceforge.net'>SourceForge</a></i>
</div>
</div>";
@@ -422,7 +458,7 @@
</div>
</div>
<div id='foot_install'>
- <i>Pandora FMS is a Free Software project registered at
+ <i>Pandora FMS is an OpenSource Software project registered at
<a target='_new' href='http://pandora.sourceforge.net'>SourceForge</a></i>
</div>
</div>";
@@ -451,7 +487,7 @@
</div>
</div>
<div id='foot_install'>
- <i>Pandora FMS is a Free Software project registered at
+ <i>Pandora FMS is an OpenSource Software project registered at
<a target='_new' href='http://pandora.sourceforge.net'>SourceForge</a></i>
</div>
</div>";
Modified: trunk/pandora_console/operation/agentes/networkmap.php
===================================================================
--- trunk/pandora_console/operation/agentes/networkmap.php 2008-08-29 16:05:08 UTC (rev 1048)
+++ trunk/pandora_console/operation/agentes/networkmap.php 2008-09-01 04:22:26 UTC (rev 1049)
@@ -46,6 +46,7 @@
// Get agent data
$agents = get_db_all_rows_sql ('SELECT id_grupo, nombre, id_os, id_parent, id_agente FROM tagente WHERE disabled = 0 ORDER BY id_grupo');
+ if ($agents)
foreach ($agents as $agent) {
if (give_acl ($config["id_user"], $agent["id_grupo"], "AR") == 0)
continue;
Modified: trunk/pandora_console/pandoradb.sql
===================================================================
--- trunk/pandora_console/pandoradb.sql 2008-08-29 16:05:08 UTC (rev 1048)
+++ trunk/pandora_console/pandoradb.sql 2008-09-01 04:22:26 UTC (rev 1049)
@@ -76,18 +76,6 @@
KEY `data_index1` (`id_agente_modulo`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ;
-CREATE TABLE IF NOT EXISTS `tagent_data_image` (
- `id` bigint(20) unsigned NOT NULL auto_increment,
- `id_agent_module`int(10) unsigned NOT NULL default '0',
- `id_agent` int(10) unsigned NOT NULL default '0',
- `blob` mediumblob NOT NULL,
- `filename` varchar(255) default '',
- `timestamp` datetime NOT NULL default '0000-00-00 00:00:00',
- `utimestamp` int(20) unsigned default '0',
- PRIMARY KEY (`id`),
- KEY `img_idx1` (`id_agent`,`id_agent_module`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
CREATE TABLE IF NOT EXISTS `tagente_datos_inc` (
`id_adi` int(10) unsigned NOT NULL auto_increment,
`id_agente_modulo` int(10) unsigned NOT NULL default '0',
Deleted: trunk/pandora_console/pandoradb_12_to_13.sql
===================================================================
--- trunk/pandora_console/pandoradb_12_to_13.sql 2008-08-29 16:05:08 UTC (rev 1048)
+++ trunk/pandora_console/pandoradb_12_to_13.sql 2008-09-01 04:22:26 UTC (rev 1049)
@@ -1,202 +0,0 @@
-ALTER TABLE tagent_access ADD column `utimestamp` bigint(20) NOT NULL default '0';
-ALTER TABLE tagente_datos MODIFY COLUMN `id_agente` mediumint(8) unsigned NOT NULL default '0';
-ALTER TABLE tagente_datos ADD column `utimestamp` int(10) unsigned default '0';
-
-ALTER TABLE tagente_datos DROP key data_index_2;
-ALTER TABLE tagente_datos DROP key data_index_3;
-ALTER TABLE tagente_datos DROP key data_index_1;
-ALTER TABLE tagente_datos ADD KEY `data_index2` (`id_agente`,`id_agente_modulo`);
-ALTER TABLE tagente_datos_inc ADD column `utimestamp` int(10) unsigned default '0';
-ALTER TABLE tagente_datos_string ADD column `utimestamp` int(10) unsigned default '0';
-ALTER TABLE tagente_datos_string DROP KEY `data_string_index_3`;
-ALTER TABLE tagente_estado ADD column `utimestamp` bigint(20) NOT NULL default '0';
-ALTER TABLE tagente_estado ADD column `current_interval` int(10) unsigned NOT NULL default '0';
-ALTER TABLE tagente_estado ADD column `running_by` int(10) unsigned NULL default 0;
-ALTER TABLE tagente_estado ADD column `last_execution_try` bigint(20) NOT NULL default '0';
-ALTER TABLE tagente_modulo MODIFY COLUMN `flag` tinyint(3) unsigned default '1';
-ALTER TABLE tagente_modulo ADD COLUMN `id_modulo` int(11) unsigned NULL default 0;
-ALTER TABLE tagente_modulo ADD KEY `tam_agente` (`id_agente`);
-
-ALTER TABLE talerta_agente_modulo ADD COLUMN `alert_text` varchar(255) default '';
-ALTER TABLE talerta_agente_modulo ADD COLUMN `disable` int(4) default '0';
-ALTER TABLE talerta_agente_modulo ADD COLUMN `time_from` TIME default '00:00:00';
-ALTER TABLE talerta_agente_modulo ADD COLUMN `time_to` TIME default '00:00:00';
-
-ALTER TABLE talerta_agente_modulo MODIFY COLUMN `dis_max` double(18,2) default NULL;
-ALTER TABLE talerta_agente_modulo MODIFY COLUMN `dis_min` double(18,2) default NULL;
-ALTER TABLE tagente_modulo ADD COLUMN `alert_text` varchar(255) default '';
-ALTER TABLE tagente_modulo ADD COLUMN `disable` int(4) default '0';
-ALTER TABLE tagente_modulo ADD COLUMN `time_from` int(8) default '0';
-ALTER TABLE tagente_modulo ADD COLUMN `time_to` int(8) default '0';
-ALTER TABLE `tagente_modulo` DROP PRIMARY KEY ,ADD PRIMARY KEY ( `id_agente_modulo` , `id_agente` );
-ALTER TABLE tevento ADD COLUMN `utimestamp` bigint(20) unsigned NOT NULL default '0';
-ALTER TABLE tgrupo ADD COLUMN `parent` tinyint(4) NOT NULL default '-1';
-ALTER TABLE tgrupo ADD COLUMN `disabled` tinyint(4) NOT NULL default '0';
-ALTER TABLE tincidencia ADD COLUMN `notify_email` TINYINT UNSIGNED NOT NULL DEFAULT 0;
-ALTER TABLE tlanguage MODIFY COLUMN `name` varchar(100) NOT NULL default '';
-ALTER TABLE tserver ADD COLUMN `recon_server` tinyint(3) unsigned NOT NULL default '0';
-ALTER TABLE tserver ADD COLUMN `version` varchar(20) NOT NULL default '';
-ALTER TABLE tsesion ADD COLUMN `utimestamp` bigint(20) unsigned NOT NULL default '0';
-
-CREATE TABLE `taddress` (
- `id_a` bigint(20) unsigned NOT NULL auto_increment,
- `ip` varchar(15) NOT NULL default '',
- `ip_pack` int(10) unsigned NOT NULL default '0',
- PRIMARY KEY (`id_a`)
-) ENGINE=InnoDB;
-
-CREATE TABLE `taddress_agent` (
- `id_ag` bigint(20) unsigned NOT NULL auto_increment,
- `id_a` bigint(20) unsigned NOT NULL default '0',
- `id_agent` mediumint(8) unsigned NOT NULL default '0',
- PRIMARY KEY (`id_ag`)
-) ENGINE=InnoDB;
-
-CREATE TABLE `tmodule` (
- `id_module` int(11) unsigned NOT NULL auto_increment,
- `name` varchar(100) NOT NULL default '',
- PRIMARY KEY (`id_module`)
-) ENGINE=InnoDB;
-
-CREATE TABLE `tnetwork_component` (
- `id_nc` mediumint(12) unsigned NOT NULL auto_increment,
- `name` varchar(50) NOT NULL,
- `description` varchar(250) default NULL,
- `id_group` mediumint(9) NOT NULL default '1',
- `type` smallint(6) NOT NULL default '6',
- `max` bigint(20) NOT NULL default '0',
- `min` bigint(20) NOT NULL default '0',
- `module_interval` mediumint(8) unsigned NOT NULL default '0',
- `tcp_port` int(10) unsigned NOT NULL default '0',
- `tcp_send` varchar(250) NOT NULL,
- `tcp_rcv` varchar(250) NOT NULL default 'NULL',
- `snmp_community` varchar(250) NOT NULL default 'NULL',
- `snmp_oid` blob NOT NULL,
- `id_module_group` tinyint(4) NOT NULL default '0',
- PRIMARY KEY (`id_nc`)
-) ENGINE=InnoDB;
-
-
-CREATE TABLE `tnetwork_component_group` (
- `id_sg` mediumint(8) unsigned NOT NULL auto_increment,
- `name` varchar(200) NOT NULL default '',
- `parent` mediumint(9) NOT NULL default '0',
- PRIMARY KEY (`id_sg`)
-) ENGINE=InnoDB;
-
-
-CREATE TABLE `tnetwork_profile` (
- `id_np` mediumint(8) unsigned NOT NULL auto_increment,
- `name` varchar(100) NOT NULL default '',
- `description` varchar(250) default '',
- PRIMARY KEY (`id_np`)
-) ENGINE=InnoDB;
-
-
-CREATE TABLE `tnetwork_profile_component` (
- `id_npc` mediumint(8) unsigned NOT NULL auto_increment,
- `id_nc` mediumint(8) unsigned NOT NULL default '0',
- `id_np` mediumint(8) unsigned NOT NULL default '0',
- PRIMARY KEY (`id_npc`)
-) ENGINE=InnoDB;
-
-CREATE TABLE `trecon_task` (
- `id_rt` int(10) unsigned NOT NULL auto_increment,
- `name` varchar(100) NOT NULL default '',
- `description` varchar(250) NOT NULL default '',
- `type` tinyint(3) unsigned NOT NULL default '0',
- `subnet` varchar(64) NOT NULL default '',
- `id_network_server` int(10) unsigned NOT NULL default '0',
- `id_network_profile` int(10) unsigned NOT NULL default '0',
- `create_incident` tinyint(3) unsigned NOT NULL default '0',
- `id_group` int(10) unsigned NOT NULL default '1',
- `utimestamp` bigint(20) unsigned NOT NULL default '0',
- `status` tinyint(4) NOT NULL default '0',
- `interval_sweep` int(10) unsigned NOT NULL default '0',
- `id_network_server_assigned` int(10) unsigned NOT NULL default '0',
- PRIMARY KEY (`id_rt`)
-) ENGINE=InnoDB;
-
-
-CREATE TABLE `tnews` (
- `id_news` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
- `author` varchar(255) NOT NULL DEFAULT '',
- `subject` varchar(255) NOT NULL DEFAULT '',
- `text` TEXT NOT NULL,
- `timestamp` DATETIME NOT NULL DEFAULT 0,
- PRIMARY KEY(`id_news`)
-) ENGINE = InnoDB;
-
-CREATE TABLE `tgraph` (
- `id_graph` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
- `id_user` varchar(100) NOT NULL default '',
- `name` varchar(150) NOT NULL default '',
- `description` TEXT NOT NULL,
- `period` int(11) NOT NULL default '0',
- `width` smallint(5) UNSIGNED NOT NULL DEFAULT 0,
- `height` smallint(5) UNSIGNED NOT NULL DEFAULT 0,
- `private` tinyint(1) UNSIGNED NOT NULL default 0,
- `events` tinyint(1) UNSIGNED NOT NULL default 0,
- PRIMARY KEY(`id_graph`)
-) ENGINE = InnoDB;
-
-CREATE TABLE `tgraph_source` (
- `id_gs` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
- `id_graph` int(11) NOT NULL default 0,
- `id_agent_module` int(11) NOT NULL default 0,
- `weight` smallint(5) UNSIGNED NOT NULL DEFAULT 0,
- PRIMARY KEY(`id_gs`)
-) ENGINE = InnoDB;
-
-
-CREATE TABLE `treport` (
- `id_report` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
- `id_user` varchar(100) NOT NULL default '',
- `name` varchar(150) NOT NULL default '',
- `description` TEXT NOT NULL,
- `private` tinyint(1) UNSIGNED NOT NULL default 0,
- PRIMARY KEY(`id_report`)
-) ENGINE = InnoDB;
-
-CREATE TABLE `treport_content` (
- `id_rc` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
- `id_report` INTEGER UNSIGNED NOT NULL default 0,
- `id_gs` INTEGER UNSIGNED NOT NULL default 0,
- `id_agent_module` int(11) NOT NULL default 0,
- `type` tinyint(1) UNSIGNED NOT NULL default 0,
- `period` int(11) NOT NULL default 0,
- `sla_max` int(11) NOT NULL default 0,
- `sla_min` int(11) NOT NULL default 0,
- `sla_limit` int(11) NOT NULL default 0,
- PRIMARY KEY(`id_rc`)
-) ENGINE = InnoDB;
-
-CREATE TABLE `tlayout` (
- `id` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
- `name` varchar(50) NOT NULL,
- `id_group` INTEGER UNSIGNED NOT NULL,
- `background` varchar(200) NOT NULL,
- `fullscreen` tinyint(1) UNSIGNED NOT NULL default 0,
- `height` INTEGER UNSIGNED NOT NULL default 0,
- `width` INTEGER UNSIGNED NOT NULL default 0,
- PRIMARY KEY(`id`)
-) ENGINE = InnoDB;
-
-CREATE TABLE `tlayout_data` (
- `id` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
- `id_layout` INTEGER UNSIGNED NOT NULL default 0,
- `pos_x` INTEGER UNSIGNED NOT NULL default 0,
- `pos_y` INTEGER UNSIGNED NOT NULL default 0,
- `height` INTEGER UNSIGNED NOT NULL default 0,
- `width` INTEGER UNSIGNED NOT NULL default 0,
- `label` varchar(200) DEFAULT "",
- `image` varchar(200) DEFAULT "",
- `type` tinyint(1) UNSIGNED NOT NULL default 0,
- `period` INTEGER UNSIGNED NOT NULL default 3600,
- `id_agente_modulo` mediumint(8) unsigned NOT NULL default '0',
- `id_layout_linked` INTEGER unsigned NOT NULL default '0',
- `parent_item` INTEGER UNSIGNED NOT NULL default 0,
- `label_color` varchar(20) DEFAULT "",
- `no_link_color` tinyint(1) UNSIGNED NOT NULL default 0,
- PRIMARY KEY(`id`)
-) ENGINE = InnoDB;
Modified: trunk/pandora_console/pandoradb_data.sql
===================================================================
--- trunk/pandora_console/pandoradb_data.sql 2008-08-29 16:05:08 UTC (rev 1048)
+++ trunk/pandora_console/pandoradb_data.sql 2008-09-01 04:22:26 UTC (rev 1049)
@@ -51,7 +51,7 @@
(6,'graph_res','5'),
(7,'step_compact','1'),
(8,'db_scheme_version','2.0'),
-(9,'db_scheme_build','PD80822'),
+(9,'db_scheme_build','PD80901'),
(13,'show_unknown','0'),
(14,'show_lastalerts','1'),
(15,'style','pandora'),
@@ -255,19 +255,7 @@
INSERT INTO `tnetwork_component` (`id_nc`, `name`, `description`, `id_group`, `type`, `max`, `min`, `module_interval`, `tcp_port`, `tcp_send`, `tcp_rcv`, `snmp_community`, `snmp_oid`, `id_module_group`, `id_modulo`) VALUES (51,'OS Raw Interrupts','Get system raw interrupts from SO',13,16,0,0,180,0,'','','public','UCD-SNMP-MIB::ssRawInterrupts.0',4,2);
INSERT INTO `tnetwork_component` (`id_nc`, `name`, `description`, `id_group`, `type`, `max`, `min`, `module_interval`, `tcp_port`, `tcp_send`, `tcp_rcv`, `snmp_community`, `snmp_oid`, `id_module_group`, `id_modulo`) VALUES (52,'OS IO Signals sent','IO Signals sent by Kernel',13,16,0,0,180,0,'','','public','UCD-SNMP-MIB::ssIOSent.0',4,2);
INSERT INTO `tnetwork_component` (`id_nc`, `name`, `description`, `id_group`, `type`, `max`, `min`, `module_interval`, `tcp_port`, `tcp_send`, `tcp_rcv`, `snmp_community`, `snmp_oid`, `id_module_group`, `id_modulo`) VALUES (53,'System Uptime','Sistem uptime in timeticks',1,15,0,0,180,0,'','','public','HOST-RESOURCES-MIB::hrSystemUptime.0',4,2);
-INSERT INTO `tnetwork_component` VALUES (54,'System IO Recv','Linux System IO Recv ',5,15,0,0,180,0,'','','public','.1.3.6.1.4.1.2021.11.6.0',4,2,'','','',0);
-INSERT INTO `tnetwork_component` VALUES (55,'System SwapIn ','Linux System Swap In',5,15,0,0,180,0,'','','public','.1.3.6.1.4.1.2021.11.3.0',1,2,'','','',0);
-INSERT INTO `tnetwork_component` VALUES (56,'System Buffer Memory','Linux System Buffer Memory (used as available\nmemory)',5,15,0,0,180,0,'','','public','.1.3.6.1.4.1.2021.4.14.0',4,2,'','','',0);
-INSERT INTO `tnetwork_component` VALUES (57,'System Cached Memory','Linux System Cached Memory (used as free\nmemory)',5,15,0,0,180,0,'','','public','.1.3.6.1.4.1.2021.4.15.0',4,2,'','','',0);
-INSERT INTO `tnetwork_component` VALUES (58,'System Processes','Total system process on any host',12,15,0,0,180,0,'','','public','.1.3.6.1.2.1.25.1.6.0',4,2,'','','',0);
-INSERT INTO `tnetwork_component` VALUES (59,'CPU User','Linux User CPU Usage (%)',5,15,0,0,180,0,'','','public','.1.3.6.1.4.1.2021.11.9.0',4,2,'','','',0);
-INSERT INTO `tnetwork_component` VALUES (60,'CPU System','Linux System CPU usage',5,15,0,0,180,0,'','','public','.1.3.6.1.4.1.2021.11.10.0',4,2,'','','',0);
-INSERT INTO `tnetwork_component` VALUES (177,'System Context Change','Linux System Context changes ',5,15,0,0,180,0,'','','public','.1.3.6.1.4.1.2021.11.8.0',4,2,'','','',0);
-INSERT INTO `tnetwork_component` VALUES (178,'System Interrupts','Linux system interrupts ',5,15,0,0,180,0,'','','public','.1.3.6.1.4.1.2021.11.7.0',4,2,'','','',0);
INSERT INTO `tnetwork_component` (`id_nc`, `name`, `description`, `id_group`, `type`, `max`, `min`, `module_interval`, `tcp_port`, `tcp_send`, `tcp_rcv`, `snmp_community`, `snmp_oid`, `id_module_group`, `id_modulo`) VALUES (176,'Catalyst Free Mem','Taken from ftp://ftp.cisco.com/pub/mibs/oid/OLD-CISCO-MEMORY-MIB.oid',2,15,0,0,180,0,'','','public','1.3.6.1.4.1.9.2.1.8',4,2);
-INSERT INTO `tnetwork_component` VALUES (61,'GigabitEthernet1/0/1 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10101',2,2,'','','',0);
-INSERT INTO `tnetwork_component` VALUES (62,'GigabitEthernet1/0/2 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10102',2,2,'','','',0);
-INSERT INTO `tnetwork_component` VALUES (63,'GigabitEthernet1/0/3 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10103',2,2,'','','',0);
-- WMI components
INSERT INTO `tnetwork_component` (`id_nc`, `name`, `description`, `id_group`, `type`, `max`, `min`, `module_interval`, `tcp_port`, `tcp_send`, `tcp_rcv`, `snmp_community`, `snmp_oid`, `id_module_group`, `id_modulo`, `plugin_user`, `max_timeout`) VALUES (200, 'CPU load', 'CPU0 load average', 14, 1, 100, 0, 300, 1, '', '', '', 'SELECT LoadPercentage from Win32_Processor WHERE DeviceID = "CPU0"', 1, 6, 'Administrator', 10);
Deleted: trunk/pandora_console/pandoradbdata_12_to_13.sql
===================================================================
--- trunk/pandora_console/pandoradbdata_12_to_13.sql 2008-08-29 16:05:08 UTC (rev 1048)
+++ trunk/pandora_console/pandoradbdata_12_to_13.sql 2008-09-01 04:22:26 UTC (rev 1049)
@@ -1,119 +0,0 @@
-
-UPDATE tconfig SET value = '1.3' WHERE token = 'db_scheme_version';
-UPDATE tconfig SET value = '1.3' WHERE token = 'db_scheme_build';
-INSERT INTO tconfig (token, value) VALUES ('show_unknown','0');
-INSERT INTO tconfig (token, value) VALUES ('show_lastalerts','1');
-INSERT INTO tconfig (token, value) VALUES ('style','pandora');
-
-
-UPDATE tconfig_os SET icon_name = 'so_aix.png' WHERE icon_name = 'so_aix.gif';
-UPDATE tconfig_os SET icon_name = 'so_linux.png' WHERE icon_name = 'so_linux.gif';
-UPDATE tconfig_os SET icon_name = 'so_solaris.png' WHERE icon_name = 'so_solaris.gif';
-UPDATE tconfig_os SET icon_name = 'so_hpux.png' WHERE icon_name = 'so_hpux.gif';
-UPDATE tconfig_os SET icon_name = 'so_beos.png' WHERE icon_name = 'so_beos.gif';
-UPDATE tconfig_os SET icon_name = 'so_cisco.png' WHERE icon_name = 'so_cisco.gif';
-UPDATE tconfig_os SET icon_name = 'so_mac.png' WHERE icon_name = 'so_mac.gif';
-UPDATE tconfig_os SET icon_name = 'so_win.png' WHERE icon_name = 'so_win.gif';
-UPDATE tconfig_os SET icon_name = 'so_other.png' WHERE icon_name = 'so_other.gif';
-UPDATE tconfig_os SET icon_name = 'network.png' WHERE icon_name = 'network.gif';
-
-UPDATE tgrupo SET icon = 'world', parent = 0, disabled = 0 WHERE id_grupo = 1;
-UPDATE tgrupo SET icon = 'server_database', parent = 0, disabled = 0 WHERE id_grupo = 2;
-UPDATE tgrupo SET icon = 'eye', parent = 0, disabled = 0 WHERE id_grupo = 3;
-UPDATE tgrupo SET icon = 'firewall', parent = 0, disabled = 0 WHERE id_grupo = 4;
-UPDATE tgrupo SET icon = 'database_gear', parent = 0, disabled = 0 WHERE id_grupo = 8;
-UPDATE tgrupo SET icon = 'transmit', parent = 0, disabled = 0 WHERE id_grupo = 9;
-UPDATE tgrupo SET icon = 'house', parent = 0, disabled = 0 WHERE id_grupo = 10;
-UPDATE tgrupo SET icon = 'computer', parent = 0, disabled = 0 WHERE id_grupo = 11;
-UPDATE tgrupo SET icon = 'applications', parent = 0, disabled = 0 WHERE id_grupo = 12;
-
-INSERT INTO `tnetwork_component` VALUES (3,'Sysname','Get name of system using SNMP standard MIB',1,17,0,0,900,0,'','','public','.1.3.6.1.2.1.1.1.0',1);
-INSERT INTO `tnetwork_component` VALUES (19,'Power #1','PowerSupply #1 status',6,18,0,0,300,0,'','','public',' .1.3.6.1.4.1.2334.2.1.5.8.0',4);
-INSERT INTO `tnetwork_component` VALUES (20,'Power #2','PowerSupply #2 status',6,18,0,0,300,0,'','','public',' .1.3.6.1.4.1.2334.2.1.5.10.0',4);
-INSERT INTO `tnetwork_component` VALUES (22,'HSRP Status','Get status of HSRP',2,18,0,0,300,0,'','','public','1.3.6.1.4.1.9.9.106.1.2.1.1.15.12.106',2);
-INSERT INTO `tnetwork_component` VALUES (24,'NIC #1 status','Status of NIC#1',10,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.1',2);
-INSERT INTO `tnetwork_component` VALUES (25,'NIC #2 status','Status of NIC #2',10,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.2',2);
-INSERT INTO `tnetwork_component` VALUES (26,'NIC #3 status','Status of NIC #3',10,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.3',2);
-INSERT INTO `tnetwork_component` VALUES (27,'NIC #1 outOctects','Output throughtput on Interface #1',10,16,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.16.1',2);
-INSERT INTO `tnetwork_component` VALUES (28,'NIC #2 outOctects','Output troughtput on interface #2',10,16,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.16.2',1);
-INSERT INTO `tnetwork_component` VALUES (29,'NIC #3 outOctects','Output troughtput on Interface #3',10,16,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.16.3',2);
-INSERT INTO `tnetwork_component` VALUES (30,'NIC #1 inOctects','Input troughtput on Interface #1',10,16,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.10.1',2);
-INSERT INTO `tnetwork_component` VALUES (31,'NIC #2 inOctects','Input throughtput for interface #2',10,16,0,0,180,0,'','NULL','public','.1.3.6.1.2.1.2.2.1.10.2',2);
-INSERT INTO `tnetwork_component` VALUES (32,'NIC #3 inOctects','Input throught on interface #3',10,16,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.10.3',2);
-INSERT INTO `tnetwork_component` VALUES (34,'Host Alive','Check if host is alive using ICMP ping check.',10,6,0,0,120,0,'','','','',2);
-INSERT INTO `tnetwork_component` VALUES (36,'Host Latency','Get host network latency in miliseconds, using ICMP.',10,7,0,0,180,0,'','','','',2);
-INSERT INTO `tnetwork_component` VALUES (37,'Check HTTP Server','Test APACHE2 HTTP service remotely (Protocol response, not only openport)',10,9,0,0,300,80,'GET / HTTP/1.0^M^M','HTTP/1.1 200 OK','','',3);
-INSERT INTO `tnetwork_component` VALUES (38,'Check FTP Server','Check FTP protocol, not only check port.',10,9,0,0,300,21,'QUIT','221','','',3);
-INSERT INTO `tnetwork_component` VALUES (39,'Check SSH Server','Checks port 22 is opened',10,9,0,0,300,22,'','','','',2);
-INSERT INTO `tnetwork_component` VALUES (40,'Check Telnet server','Check telnet port',10,9,0,0,300,23,'','','','',2);
-INSERT INTO `tnetwork_component` VALUES (41,'Check SMTP server','Check if SMTP port it's open',10,9,0,0,300,25,'','','','',2);
-INSERT INTO `tnetwork_component` VALUES (42,'Check POP3 server','Check POP3 port.',10,9,0,0,300,110,'','','','',2);
-INSERT INTO `tnetwork_component` VALUES (43,'NIC #7 outOctects','Get outcoming octects from NIC #7',10,16,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.16.7',2);
-INSERT INTO `tnetwork_component` VALUES (44,'NIC #7 inOctects','Get incoming octects from NIC #7',10,16,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.10.7',2);
-INSERT INTO `tnetwork_component` VALUES (45,'NIC #4 Status','Get status of NIC #4',10,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.4',2);
-INSERT INTO `tnetwork_component` VALUES (46,'NIC #5 Status','Get status of NIC #5',10,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.5',2);
-INSERT INTO `tnetwork_component` VALUES (47,'NIC #6 Status','Get status of NIC #6',10,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.6',2);
-INSERT INTO `tnetwork_component` VALUES (48,'NIC #7 Status','Get status of NIC #7',10,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.7',2);
-INSERT INTO `tnetwork_component` VALUES (49,'CPU User','Linux User CPU Usage (%)',5,15,0,0,180,0,'','','public','.1.3.6.1.4.1.2021.11.9.0',4);
-INSERT INTO `tnetwork_component` VALUES (50,'CPU System','Linux System CPU usage',5,15,0,0,180,0,'','','public','.1.3.6.1.4.1.2021.11.10.0',4);
-INSERT INTO `tnetwork_component` VALUES (51,'System Context Change','Linux System Context changes ',5,15,0,0,180,0,'','','public','.1.3.6.1.4.1.2021.11.8.0',4);
-INSERT INTO `tnetwork_component` VALUES (52,'System Interrupts','Linux system interrupts ',5,15,0,0,180,0,'','','public','.1.3.6.1.4.1.2021.11.7.0',4);
-INSERT INTO `tnetwork_component` VALUES (53,'Sytem IO Sent','Linux System IO Sent ',5,15,0,0,180,0,'','','public','.1.3.6.1.4.1.2021.11.5.0',4);
-INSERT INTO `tnetwork_component` VALUES (54,'System IO Recv','Linux System IO Recv ',5,15,0,0,180,0,'','','public','.1.3.6.1.4.1.2021.11.6.0',4);
-INSERT INTO `tnetwork_component` VALUES (55,'System SwapIn ','Linux System Swap In',5,15,0,0,180,0,'','','public','.1.3.6.1.4.1.2021.11.3.0',1);
-INSERT INTO `tnetwork_component` VALUES (56,'System Buffer Memory','Linux System Buffer Memory (used as available memory)',5,15,0,0,180,0,'','','public','.1.3.6.1.4.1.2021.4.14.0',4);
-INSERT INTO `tnetwork_component` VALUES (57,'System Cached Memory','Linux System Cached Memory (used as free memory)',5,15,0,0,180,0,'','','public','.1.3.6.1.4.1.2021.4.15.0',4);
-INSERT INTO `tnetwork_component` VALUES (58,'System Processes','Total system process on any host',12,15,0,0,180,0,'','','public','.1.3.6.1.2.1.25.1.6.0',4);
-
-INSERT INTO `tnetwork_component_group` VALUES (1,'General group',0);
-INSERT INTO `tnetwork_component_group` VALUES (2,'Cisco MIBs',10);
-INSERT INTO `tnetwork_component_group` VALUES (3,'Nortel MIBS',10);
-INSERT INTO `tnetwork_component_group` VALUES (4,'3COM MIBs',10);
-INSERT INTO `tnetwork_component_group` VALUES (5,'UNIX MIBs',12);
-INSERT INTO `tnetwork_component_group` VALUES (6,'Packetshaper MIBs',10);
-INSERT INTO `tnetwork_component_group` VALUES (7,'Nortel BPS 2000 MIBs',3);
-INSERT INTO `tnetwork_component_group` VALUES (8,'Cisco Catalyst3750 MIBs',2);
-INSERT INTO `tnetwork_component_group` VALUES (9,'Cisco AP120+',2);
-INSERT INTO `tnetwork_component_group` VALUES (10,'Network Management',0);
-INSERT INTO `tnetwork_component_group` VALUES (11,'Microsoft Windows MIB',12);
-INSERT INTO `tnetwork_component_group` VALUES (12,'Operating Systems',0);
-
-UPDATE ttipo_modulo SET icon = 'mod_data.png' WHERE icon = 'mod_data.gif';
-UPDATE ttipo_modulo SET icon = 'mod_proc.png' WHERE icon = 'mod_proc.gif';
-UPDATE ttipo_modulo SET icon = 'mod_string.png' WHERE icon = 'mod_string.gif';
-UPDATE ttipo_modulo SET icon = 'mod_data_inc.png' WHERE icon = 'mod_data_inc.gif';
-UPDATE ttipo_modulo SET icon = 'mod_icmp_proc.png' WHERE icon = 'mod_icmp_proc.gif';
-UPDATE ttipo_modulo SET icon = 'mod_icmp_data.png' WHERE icon = 'mod_icmp_data.gif';
-UPDATE ttipo_modulo SET icon = 'mod_tcp_data.png' WHERE icon = 'mod_tcp_data.gif';
-UPDATE ttipo_modulo SET icon = 'mod_tcp_proc.png' WHERE icon = 'mod_tcp_proc.gif';
-UPDATE ttipo_modulo SET icon = 'mod_tcp_string.png' WHERE icon = 'mod_tcp_string.gif';
-UPDATE ttipo_modulo SET icon = 'mod_tcp_inc.png' WHERE icon = 'mod_tcp_inc.gif';
-UPDATE ttipo_modulo SET icon = 'mod_udp_proc.png' WHERE icon = 'mod_udp_proc.gif';
-UPDATE ttipo_modulo SET icon = 'mod_snmp_data.png' WHERE icon = 'mod_snmp_data.gif';
-UPDATE ttipo_modulo SET icon = 'mod_snmp_inc.png' WHERE icon = 'mod_snmp_inc.gif';
-UPDATE ttipo_modulo SET icon = 'mod_snmp_string.png' WHERE icon = 'mod_snmp_string.gif';
-UPDATE ttipo_modulo SET icon = 'mod_snmp_proc.png' WHERE icon = 'mod_snmp_proc.gif';
-
-INSERT INTO `tnews` VALUES (1,'admin','Welcome to Pandora FMS 1.3.1!','This is the new Pandora FMS Console. A lot of new features have been added since last version. Please read the documentation about it, and feel free to test any option.\r\n\r\nThe Pandora FMS Team.','2007-06-22 13:03:20');
-
-INSERT INTO `tnetwork_profile` VALUES (1,'SNMP Basic management','Basic SNMP management (only first interface)');
-INSERT INTO `tnetwork_profile` VALUES (2,'Basic Server','Check basic server services and network latency. This checks SSH, FTP and HTTP. Also a ICMP host alive check.');
-INSERT INTO `tnetwork_profile` VALUES (3,'Linux SNMP','Linux SNMP Management');
-
-INSERT INTO `tnetwork_profile_component` VALUES (1,24,1);
-INSERT INTO `tnetwork_profile_component` VALUES (2,27,1);
-INSERT INTO `tnetwork_profile_component` VALUES (3,30,1);
-INSERT INTO `tnetwork_profile_component` VALUES (4,37,2);
-INSERT INTO `tnetwork_profile_component` VALUES (5,38,2);
-INSERT INTO `tnetwork_profile_component` VALUES (6,39,2);
-INSERT INTO `tnetwork_profile_component` VALUES (7,36,2);
-INSERT INTO `tnetwork_profile_component` VALUES (8,34,2);
-INSERT INTO `tnetwork_profile_component` VALUES (9,51,3);
-INSERT INTO `tnetwork_profile_component` VALUES (10,52,3);
-INSERT INTO `tnetwork_profile_component` VALUES (11,53,3);
-INSERT INTO `tnetwork_profile_component` VALUES (12,54,3);
-INSERT INTO `tnetwork_profile_component` VALUES (13,55,3);
-INSERT INTO `tnetwork_profile_component` VALUES (14,56,3);
-INSERT INTO `tnetwork_profile_component` VALUES (15,57,3);
-
-
Modified: trunk/pandora_console/reporting/fgraph.php
===================================================================
--- trunk/pandora_console/reporting/fgraph.php 2008-08-29 16:05:08 UTC (rev 1048)
+++ trunk/pandora_console/reporting/fgraph.php 2008-09-01 04:22:26 UTC (rev 1049)
@@ -6,8 +6,9 @@
// Please see http://pandora.sourceforge.net for full contribution list
// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
+// modify it under the terms of the GNU Lesser General Public License (LGPL)
// as published by the Free Software Foundation for version 2.
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Deleted: trunk/pandora_console/upgrade.php
===================================================================
--- trunk/pandora_console/upgrade.php 2008-08-29 16:05:08 UTC (rev 1048)
+++ trunk/pandora_console/upgrade.php 2008-09-01 04:22:26 UTC (rev 1049)
@@ -1,477 +0,0 @@
-<?php
-
-// Pandora FMS - the Flexible Monitoring System
-// ============================================
-// Copyright (c) 2008 Artica Soluciones Tecnologicas, http://www.artica.es
-// Please see http://pandora.sourceforge.net for full contribution list
-
-// 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 the Free Software Foundation for version 2.
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Pandora FMS - Upgrade Wizard</title>
-<meta http-equiv="expires" content="0">
-<meta http-equiv="content-type" content="text/html; charset=utf-8">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="author" content="Sancho Lerena, Raul Mateos">
-<meta name="copyright" content="This is GPL software. Created by Sancho Lerena and others">
-<meta name="keywords" content="pandora, fms, monitoring, network, system, GPL, software">
-<meta name="robots" content="index, follow">
-<link rel="icon" href="images/pandora.ico" type="image/ico">
-<link rel="stylesheet" href="include/styles/pandora_minimal.css" type="text/css">
-<link rel="stylesheet" href="include/styles/install.css" type="text/css">
-</head>
-
-<body>
-<?php
-
-echo "<h1>INSTALLER IS NOT WORKING YET. PLEASE DO NOT USE</h1>";
-exit;
-
-error_reporting(0);
-
-function check_extension ( $ext, $label ){
- echo "<tr><td>";
- echo "<span class='arr'> $label </span>";
- echo "</td><td>";
- if (!extension_loaded($ext)){
- echo "<img src='images/dot_red.png'>";
- return 1;
- } else {
- echo "<img src='images/dot_green.png'>";
- return 0;
- }
- echo "</td></tr>";
-}
-
-function check_include ( $ext, $label ){
- echo "<tr><td>";
- echo "<span class='arr'> $label </span>";
- echo "</td><td>";
- if (!include($ext)){
- echo "<img src='images/dot_red.png'>";
- return 1;
- } else {
- echo "<img src='images/dot_green.png'>";
- return 0;
- }
- echo "</td></tr>";
-}
-
-function check_exists ( $file, $label ){
- echo "<tr><td>";
- echo "<span class='arr'> $label </span>";
- echo "</td><td>";
- if (!file_exists ($file)){
- echo " <img src='images/dot_red.png'>";
- return 1;
- } else {
- echo " <img src='images/dot_green.png'>";
- return 0;
- }
- echo "</td></tr>";
-}
-
-function check_generic ( $ok, $label ){
- echo "<tr><td>";
- echo "<span class='arr'> $label </span>";
- echo "</td><td>";
- if ($ok == 0 ){
- echo " <img src='images/dot_red.png'>";
- return 1;
- } else {
- echo " <img src='images/dot_green.png'>";
- return 0;
- }
- echo "</td></tr>";
-}
-
-function check_variable ( $var, $value, $label, $mode ){
- echo "<tr><td>";
- echo "<span class='arr'> $label </span>";
- echo "</td><td>";
- if ($mode == 1){
- if ($var >= $value){
- echo " <img src='images/dot_green.png'>";
- return 0;
- } else {
- echo " <img src='images/dot_red.png'>";
- return 1;
- }
- } elseif ($var == $value){
- echo " <img src='images/dot_green.png'>";
- return 0;
- } else {
- echo " <img src='images/dot_red.png'>";
- return 1;
- }
- echo "</td></tr>";
-}
-
-function migrate_data (){
-
- check_generic (1, "Updating tagente_datos table");
- $sql1="SELECT * FROM tagente_datos WHERE utimestamp = 0 ";
- $result1=mysql_query($sql1);
- while ($row1=mysql_fetch_array($result1)){
- $id = $row1["id_agente_datos"];
- $timestamp = $row1["timestamp"];
- $utimestamp = strtotime($timestamp);
- $sql2="UPDATE tagente_datos SET utimestamp = '$utimestamp' WHERE id_agente_datos = $id";
- mysql_query($sql2);
- }
- flush();
-
- check_generic (1,"Updating tagente_datos_string table");
- $sql1="SELECT * FROM tagente_datos_string WHERE utimestamp = 0 ";
- $result1=mysql_query($sql1);
- while ($row1=mysql_fetch_array($result1)){
- $id = $row1["id_tagente_datos_string"];
- $timestamp = $row1["timestamp"];
- $utimestamp = strtotime($timestamp);
- $sql2="UPDATE tagente_datos SET utimestamp = '$utimestamp' WHERE id_tagente_datos_string = $id";
- mysql_query($sql2);
- }
- flush();
-
- check_generic (1,"Updating tagente_estado table");
- $sql1="SELECT * FROM tagente_estado WHERE utimestamp = 0";
- $result1=mysql_query($sql1);
- while ($row1=mysql_fetch_array($result1)){
- $id = $row1["id_agente_estado"];
- $timestamp = $row1["timestamp"];
- $utimestamp = strtotime($timestamp);
- $sql2="UPDATE tagente_estado SET utimestamp = '$utimestamp', last_execution_try = '$utimestamp' WHERE id_agente_estado = $id";
- mysql_query($sql2);
- }
-
-}
-
-function parse_mysql_dump($url){
- if (file_exists($url)){
- $file_content = file($url);
- $query = "";
- foreach($file_content as $sql_line){
- if(trim($sql_line) != "" && strpos($sql_line, "--") === false){
- $query .= $sql_line;
- if(preg_match("/;[\040]*\$/", $sql_line)){
- if (!$result = mysql_query($query))
- return 0;
- $query = "";
- }
- }
- }
- return 1;
- } else {
- return 0;
- }
-}
-
-function random_name ($size){
- $temp = "";
- for ($a=0;$a< $size;$a++)
- $temp = $temp. chr(rand(122,97));
- return $temp;
-}
-
-function install_step1() {
- echo "
- <div id='install_container'>
- <h1>Pandora FMS upgrade wizard. Step #1 of 5</h1>
- <div id='wizard' style='height: 390px;'>
- <div id='install_box'>
- <h1>Welcome to Pandora FMS 1.3 upgrade Wizard</h1>
- <p>This wizard helps you to quick upgrade Pandora FMS console in your system. This tool is <b>only</b> to
-upgrade Pandora FMS 1.2 to Pandora FMS 1.3</p>
- <p>For more information, please refer to documentation.</p>
- <i>Pandora FMS Development Team</i>
- <div class='info'>Before start with upgrade process. Please <b>STOP NOW all your Pandora FMS</b></div>";
-
- if (file_exists("include/config.php")){
- echo "<div class='warn'><b>Warning:</b> You already have a config.php file in this directory, please backup and move it before continue.</div>";
- }
- echo "<div class='warn'><b>Warning:</b> This upgrade tool will <b>overwrite and change</b> your existing Pandora FMS
-<b>Database</b> and only could be used to upgrade fron Pandora FMS 1.2 to Pandora FMS 1.3. Before continue, please <b>be sure that you
-have made a SQL backup using mysqldump system tool as described in documentation.</b><br></div>";
- echo "
- </div>
- <div id='logo_img'>
- <img src='images/pandora_logo.png' border='0'><br>
- <img src='images/step0.png' border='0'>
- </div>
- <div id='install_img'>
- <a href='upgrade.php?step=2'><img align='right' src='images/arrow_next.png' border=0></a>
- </div>
- </div>
- <div id='foot_install'>
- <i>Pandora FMS is a Free Software project registered at <a target='_new' href='http://pandora.sourceforge.net'>SourceForge</a></i>
- </div>
- </div>";
-}
-
-
-function install_step2() {
- echo "
- <div id='install_container'>
- <h1>Pandora FMS upgrade wizard. Step #2 of 5</h1>
- <div id='wizard' style='height: 340px;'>
- <div id='install_box'>";
- echo "<h1>Checking software dependencies</h1>";
- echo "<table border=0 width=230>";
- $res = 0;
- $res += check_variable(phpversion(),"4.3","PHP version >= 4.3.x",1);
- $res += check_extension("mysql","PHP MySQL extension");
- //$res += check_extension("curl","PHP Curl extension");
- $res += check_extension("gd","PHP gd extension");
- $res += check_extension("snmp","PHP SNMP extension");
- $res += check_extension("session","PHP session extension");
- $res += check_include("PEAR.php","PEAR PHP Library");
- $step6 = is_writable("include");
- check_generic ($step6, "Write permissions to save config file in './include'");
- if ($step6 == 0)
- $res++;
-
- //$res += check_exists ("/usr/bin/pdflatex","PDF Latex in /usr/bin/pdflatex");
- echo "</table>
- </div>
- <div id='logo_img'>
- <img src='images/pandora_logo.png' border='0' alt=''><br>
- <img src='images/step1.png' border='0' alt=''>
- </div>
- <div id='install_img'>";
- if ($res > 0) {
- echo "<div class='warn'>You have some uncomplete
- dependencies. Please correct them or this wizard tool
- will not be able to finish your installation.
- </div><br>
- Ignore it. <a href='upgrade.php?step=3'>Ignore it and go to Step #3</a>";
- } else {
- echo "<a href='upgrade.php?step=3'><img align='right' src='images/arrow_next.png' border=0 alt=''></a>";
- }
- echo "
- </div>
- </div>
- <div id='foot_install'>
- <i>Pandora FMS is a Free Software project registered at
- <a target='_new' href='http://pandora.sourceforge.net'>SourceForge</a></i>
- </div>
- </div>";
-}
-
-
-function install_step3() {
- echo "
- <div id='install_container'>
- <h1>Pandora FMS upgrade wizard. Step #3 of 5 </h1>
- <div id='wizard' style='height: 520px;'>
- <div id='install_box'>
- <h1>Environment and database setup</h1>
- <p>
- This wizard will transform your Pandora FMS database, and populate it with all the data needed to run for the first time, modifying existing data to be used by the new version.
- </p>
- <p>
- You need a user to modify and create database schema, this is usually the existant <b>pandora</b> user, you could check on config.php file of Pandora FMS 1.2 installation.
- </p>";
- echo "<form method='post' action='upgrade.php?step=4'>
- <div>DB User with privileges on MySQL</div>
- <input class='login' type='text' name='user' value='pandora'>
-
- <div>DB Password for this user</div>
- <input class='login' type='password' name='pass' value=''>
-
- <div>DB Hostname of MySQL</div>
- <input class='login' type='text' name='host' value='localhost'>
-
- <div>DB Name (pandora by default)</div>
- <input class='login' type='text' name='dbname' value='pandora'>
-
- <div>Full path to HTTP publication directory<br>
- <span class='f9b'>For example /var/www/pandora_console/. Needed for graphs and attachments.</span>
- </div>
- <input class='login' type='text' name='path' style='width: 190px;' value='/var/www/pandora_console/'>
-
- <div>Full local URL to Pandora FMS Console<br>
- <span class='f9b'>For example http://localhost/pandora_console</span>
- </div>
- <input class='login' type='text' name='url' style='width: 250px;' value='http://localhost/pandora_console'>
-
- <div align='right'><input type='image' src='images/arrow_next.png' value='Step #4' id='step4'></div>
- </form>
- </div>
- <div id='logo_img'>
- <img src='images/pandora_logo.png' border='0' alt=''><br>
- <img src='images/step2.png' border='0' alt=''>
- </div>
- </div>
- <div id='foot_install'>
- <i>Pandora FMS is a Free Software project registered at
- <a target='_new' href='http://pandora.sourceforge.net'>SourceForge</a></i>
- </div>
- </div>";
-}
-
-
-function install_step4() {
- $pandora_config = "include/config.php";
-
- if ( (! isset($_POST["user"])) || (! isset($_POST["dbname"])) || (! isset($_POST["host"])) || (! isset($_POST["pass"])) ) {
- $dbpassword = "";
- $dbuser = "";
- $dbhost = "";
- $dbname = "";
- } else {
- $dbpassword = $_POST["pass"];
- $dbuser = $_POST["user"];
- $dbhost = $_POST["host"];
- $dbname = $_POST["dbname"];
- if (isset($_POST["url"]))
- $url = $_POST["url"];
- else
- $url = "http://localhost";
- if (isset($_POST["path"]))
- $path = $_POST["path"];
- else
- $path = "/var/www";
- }
- $everything_ok = 0;
- $step1=0; $step2=0; $step3=0;
- $step4=0; $step5=0; $step6=0; $step7=0;
- echo "<div id='install_container'>
- <h1>Pandora FMS upgrade wizard. Step #4 of 5</h1>
- <div id='wizard' style='height: 540px;'>
- <div id='install_box'>
- <h1>Modifing database schema and adding data</h1>This could take a while... please wait</h2>
- <table>";
- if (! mysql_connect ($dbhost,$dbuser,$dbpassword)) {
- check_generic ( 0, "Connection with Database");
- } else {
- check_generic ( 1, "Connection with Database");
- // Create schema
- if (mysql_select_db($dbname))
- $step2 = 1;
- else
- $step2 = 0;
- check_generic ($step2, "Opening database '$dbname'");
- flush();
- $step3 = (parse_mysql_dump("pandoradb_12_to_13.sql"));
- check_generic ($step3, "Schema manipulation");
- flush();
- $step4 = parse_mysql_dump("pandoradbdata_12_to_13.sql");
- check_generic ($step4, "Populating new schema and converting data");
- flush();
- $cfgin = fopen ("include/config.inc.php","r");
- $cfgout = fopen ($pandora_config,"w");
- $config_contents = fread ($cfgin, filesize("include/config.inc.php"));
-
- $config_new = '<?php
-// Begin of automatic config file
-$dbname="'.$dbname.'"; // MySQL DataBase name
-$dbuser="'.$dbuser.'"; // DB User
-$dbpassword="'.$dbpassword.'"; // DB Password
-$dbhost="'.$dbhost.'"; // DB Host
-$config_homedir="'.$path.'"; // Config homedir
-$BASE_URL="'.$url.'"; // Base URL
-// End of automatic config file
-?>';
- $step5 = fputs ($cfgout, $config_new);
- $step5 = $step5 + fputs ($cfgout, $config_contents);
- if ($step5 > 0)
- $step5 = 1;
- fclose ($cfgin);
- fclose ($cfgout);
- chmod ($pandora_config, 0600);
- check_generic ($step5, "Created new config file at '".$pandora_config."'");
-
- }
- if (($step5 + $step4 + $step3 + $step2 ) == 4) {
- $everything_ok = 1;
- migrate_data();
- }
-
- echo "</table></div>
- <div id='logo_img'>
- <img src='images/pandora_logo.png' border='0' alt=''><br>
- <img src='images/step3.png' border='0' alt=''>
- </div>
-
- <div id='install_img'>";
- if ($everything_ok == 1) {
- echo "<br><br><a href='upgrade.php?step=5'><img align='right' src='images/arrow_next.png' border='0' alt=''></a>";
- } else {
- echo "<div class='warn'><b>There was some problems. Installation is not completed.</b>
- <p>Please correct failures, and restore original DB before trying again.</div>";
-
- if (mysql_error() != "")
- echo "<div class='warn'> <b>ERROR:</b> ". mysql_error().".</div>";
- }
- echo "
- </div>
- </div>
- <div id='foot_install'>
- <i>Pandora FMS is a Free Software project registered at
- <a target='_new' href='http://pandora.sourceforge.net'>SourceForge</a></i>
- </div>
-</div>";
-
-}
-
-function install_step5() {
- echo "
- <div id='install_container'>
- <h1>Pandora FMS upgrade wizard. Finished</h1>
- <div id='wizard' style='height: 300px;'>
- <div id='install_box'>
- <h1>Upgrade complete!</h1>
- <p>You now must delete manually installer and upgrade tool ('<i>install.php</i>, <i>upgrade.php</i>') files for security before trying to access to your Pandora FMS console.
- <p>Don't forget to check <a href='http://pandora.sourceforge.net'>http://pandora.sourceforge.net</a> for updates.
- <p><a href='index.php'>Click here to access to your Pandora FMS console</a></p>
- </div>
- <div id='logo_img'>
- <img src='images/pandora_logo.png' border='0'><br>
- <img src='images/step4.png' border='0'><br>
- </div>
- </div>
- <div id='foot_install'>
- <i>Pandora FMS is a Free Software project registered at
- <a target='_new' href='http://pandora.sourceforge.net'>SourceForge</a></i>
- </div>
-</div>";
-}
-
-
-// ---------------
-// Main page code
-// ---------------
-
-if (! isset($_GET["step"])){
- install_step1();
-} else {
- $step = $_GET["step"];
- switch ($step) {
- case 2: install_step2();
- break;
- case 3: install_step3();
- break;
- case 4: install_step4();
- break;
- case 5: install_step5();
- break;
- case 6: install_step6();
- break;
- }
-}
-
-?>
-</body>
-</html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|