From 86f9d2dcbd61bd3cb509554e68c06a582587b83d Mon Sep 17 00:00:00 2001 From: slerena Date: Mon, 20 Aug 2007 15:32:27 +0000 Subject: [PATCH] 2007-08-20 Sancho Lerena * pandoradb.sql: Used UTF-8 by default * index.php. UTF-8 Default. * README: Updated texts for Readme. * INSTALL: Deteled old stuff git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@605 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 10 ++++ pandora_console/INSTALL | 74 ---------------------------- pandora_console/README | 66 ++++++++++++++++++------- pandora_console/index.php | 2 +- pandora_console/pandoradb.sql | 90 +++++++++++++++++------------------ pandora_console/upgrade.php | 37 +++++++------- 6 files changed, 125 insertions(+), 154 deletions(-) delete mode 100644 pandora_console/INSTALL diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index eb86ce90bc..fd59f70a9b 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,5 +1,15 @@ 2007-08-20 Sancho Lerena + * pandoradb.sql: Used UTF-8 by default + + * index.php. UTF-8 Default. + + * README: Updated texts for Readme. + + * INSTALL: Deteled old stuff + + * upgrade.php: Links fixed. + * migrate.php renamed to upgrade.php * Deleted old upgrade scripts from 1.1 diff --git a/pandora_console/INSTALL b/pandora_console/INSTALL deleted file mode 100644 index 7996b08c82..0000000000 --- a/pandora_console/INSTALL +++ /dev/null @@ -1,74 +0,0 @@ -Installation: - -Requires a Web Server (Apache recommended) with PHP 4.3.x (or higher but PHP 5 Not tested yet), -PHP4-MySQL and PHP4-session modules, PHP-GD v1.3 library -and JpGraph (http://www.aditus.nu/jpgraph/) for graphic generation. - -You need a database with name "pandora". - -To create the structure of Pandora database in MySQL Server you have the SQL script "pandoradb.sql". -It creates tables and indexes needed to insert information into Pandora database. - -You MUST populate database with SQL script "pandoradb_data.sql", -it inserts data needed to run Web Console and default user (login: admin, pass: pandora) -to access Pandora Web Console. - -To install the files, first create a database called "pandora", -and set an user to be able to access this database: - -mysql> create database pandora; - -Later, execute the next commands using a user with enough privileges to create tables and indexes -into Pandora Database into your MySQL Server: - -cat pandoradb.sql | mysql -D pandora -u root -p -cat pandoradb_data.sql | mysql -D pandora -u root -p - -Note: if your system is Windows, use the command type instead of cat. - -You can also use the source command, if you are connected to MySQL, from the MySQL prompt: - -mysql> use pandora; -mysql> source -mysql> source - -This example is valid using root user in MySQL. -Remember if you're in Windows and you use MySQL v4.1, use the dobule slash ("//") with the path to the files, -not the backslash ("\"). - -If you have any problem with this commands, from the OS command line you can run this commands: - -cat pandoradb.sql | mysql -D pandora -u root -p -cat pandoradb_data.sql | mysql -D pandora -u root -p - -Note: if you're using Windows, you must use type command instead of the cat one. - -Now we will create an user "pandora" and will be given to it privileges from the localhost: - -mysql> grant all on pandora.* to 'pandora'@'localhost' identified by 'pandora'; - -Keep in mind that users need access from Pandora WEB Console and from Pandora Server, -if your deployment has many subcomponents in different physical machines, -you need to setup a MySQL user with privileges to access from different locations. - -If you get the error "Warning: mysql_connect() [function.mysql-connect]: client does not support authentication protocol requested by server; consider upgrading" -when authenticating Web Console, you have to change the way the password is stored into the database (see FAQ): - -mysql> set password for 'pandora'@'localhost' = old_password('pandora'); - -Please note this user will be used by several Pandora subcomponents(Pandora Server, Pandora Web Console) to access database. - -Configuration: - -The only file you need to modify is include/config.php, where the following variables are included in .php code: -$dbname="pandora"; // name of database for pandora (default: pandora) -$dbuser="pandora"; // mysql user to access pandora database -$dbpassword="pandora"; // Password for mysql user to access pandora database -$dbhost="pandora"; // Hostname or IP where mySQL server runs - -If database is defined and was correctly installed, you can now access: -http://://index.php - -The first time you log there is a default admin user "admin" and password "pandora". -It's worth to say that you MUST CHANGE CREDENTIALS BEFORE LOGIN FIRST TIME, -change it or create another account, disabling this one. \ No newline at end of file diff --git a/pandora_console/README b/pandora_console/README index f6618347bc..187b8008de 100644 --- a/pandora_console/README +++ b/pandora_console/README @@ -1,41 +1,73 @@ -Pandora: The Free Distributed Monitoring System +Pandora FMS : The Free Monitoring System (v1.3) =============================================== -Version 1.2 +http://pandora.sourceforge.net -What is Pandora DMS +What is Pandora FMS ------------------- -Pandora are a Free Software set of programs that allows to analyze in a visual way status and performance of several parameters from different Operating Systems, servers, applications and hardware systems as Firewalls, Proxies, Data Bases, Web Servers or Routers. All integrated into an open and distributed architecture. +Pandora watches your systems and applications, and allows you to know the status of any element of those systems. Pandora could detect a +network interface down, a defacement in your website, a memory leak in one of your server app, or the movement of any value of the NASDAQ +new technology market. If you want, Pandora could send out SMS message when your systems fails... or when Google's value drop below US$ 33. -Pandora can be deployed in every Operating System. You have an agent for every platform. Pandora can monitor hardware systems with TCP/IP Stack, as load balancers, routers, switches, printers and so on. +Pandora will adjust, like an octopus, to your systems and requirements, because has been designed to be open, modular, multiplattform and +easy to customize and use, all integrated into a scalable and distributed architecture. -Pandora has six components: Pandora Data Server, Pandora Network Server, Pandora SNMP Console, Pandora Agents, Pandora Database and Pandora Web Management System (Web Console). +Pandora runs on any operating system, with specific agents for each platform gathering data and sending it to a server, it has specific +agents for GNU/Linux, AIX, Solaris, HP-UX, BSD/IPSO, and Windows 2000, XP and 2003. -Pandora Servers and SNMP Console +Pandora can also monitor any kind of TCP/IP service, without the need to install agents, and monitor network systems such as load +balancers, routers, switches, operating systems, applications, or simply printers if you need. Pandora also supports SNMP for collecting +data and for receiving traps. -They are the recipient of bundles of information and the generators of alerts; they are the brain of the system. We can have several servers for very big systems or a single server. They are developed in Perl and works under any platform, with the required modules. Nevertheless its "official" platform is GNU/Linux. They also insert the gathered data into the Database. You can have several Pandora Servers connected with the same Database. +A few examples of common resources monitored by Pandora could be processor load, disk and memory usage, running processes, log files, +environmental factors such as temperature, or application values like strings contained in web pages or any possible way to collect data in +an automatic way. -Pandora Web Console +Pandora FMS Features +-------------------- -It allows to manage the system and to operate with it; it's the user interface of Pandora. We can have several Web Consoles in the same implantation. It is developed in PHP and leans on a Data Base and a Web Server, being able to work in any platform: GNU/Linux, Solaris, Win2000, AIX and others. + * Lightweigth agents. No need to install adicional software. + * Also could use network to collect data on remote systems. + * High availability for each component. + * Escalable architecture: no liminitation on number of servers you can setup for the same enviroment. + * Internal detection on Network Servers in case of failure, automatic takeover of secondary servers. + * Stores all data for many weeks or months + * Support for implementing redundant and distributed monitoring servers. + * Data is stored in a relational database (MySQL). + * Automatic database optimization for size, using interpolation and compression algorithms. + * Integrated alert systems: send mails, execute scripts, send SMS, or simply write to syslog are a few examples. + * Integrated graphical reporting system for any kind of collected data. + * SNMP Trap reception with Realtime Console. + * Granularity of accesses and user profiles for each group and each user. + * Integrated internal auditing for any operation. + * Alert filtering to avoid false positives. + * Event system with user validation for operation in teams. + * Integrated incident system with flows and different profiles. + * Any collected value can be displayed as graph or data table. + * Alerts can be triggered any kind of event, in many ways. + * WebConsole on line HTML contextual help. + * Integrated DB management: purge and DB compaction. + * Mass configuration/alert manager to copy and distribute agent-module and/or agents/alerts setup to other agents. + * Profiles could be personalized using up to eight security attributes without limitation on groups or profiles. + * Filters for collected data to avoid bad data. -Pandora Database +Install +------- -Core module of Pandora (as you can see in the architecture overview). In this database resides all the information of the enterprise, for example, all data gathered by agents, all configuration defined by administrator, all events, incidents, audit info... At this moment, only MySQL DataBase is supported. More Databases in the future. +Please visit our online documentation site or download install guides at http://pandora.sourceforge.net -Pandora Agents - -They can monitor any numeric parameter, boolean states, strings or numerical incremental data and/or condition. They have a centralized architecture based on lightweight design for agents (shellscript, wsh, perl) and light agents to collect data. They support all type of platforms (Microsoft, AIX, Solaris, GNU/Linux, IPSO, FreeBSD, etc) because the agents are completely free software, and they communicate using SSH, FTP, NFS or other good way, using an XML container to transport data. What do I need? --------------- -Perl, Perl Modules, MySQL, PHP, PHP Modules. See the Installation Documentation or go to http://pandora.sourceforge.net + +Perl 5.8, Some Perl modules, MySQL4x or higher, PHP5, and some PHP Modules. See the Installation Documentation or go to +http://pandora.sourceforge.net License ------- The project is distributed under the GPL License v2 or later. -Copyright (C) 2004-2006 Sancho Lerena. +Copyright (C) 2004-2007 Pandora FMS development team diff --git a/pandora_console/index.php b/pandora_console/index.php index ab67173c4b..b4d9ac32a5 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -104,7 +104,7 @@ if ( (isset ($_GET["refr"])) || (isset($_POST["refr"])) ){ ?> Pandora FMS - <?php echo $lang_label["header_title"]; ?> - + diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index bd8e4ca100..4f5fd617a0 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -6,7 +6,7 @@ CREATE TABLE `taddress` ( `ip` varchar(15) NOT NULL default '', `ip_pack` int(10) unsigned NOT NULL default '0', PRIMARY KEY (`id_a`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `taddress_agent` ( @@ -14,7 +14,7 @@ CREATE TABLE `taddress_agent` ( `id_a` bigint(20) unsigned NOT NULL default '0', `id_agent` mediumint(8) unsigned NOT NULL default '0', PRIMARY KEY (`id_ag`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tagent_access` ( @@ -24,7 +24,7 @@ CREATE TABLE `tagent_access` ( `utimestamp` bigint(20) NOT NULL default '0', PRIMARY KEY (`id_ac`), KEY `agent_index` (`id_agent`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tagente` ( @@ -44,7 +44,7 @@ CREATE TABLE `tagente` ( `agent_type` int(2) unsigned NOT NULL default '0', `id_server` int(10) unsigned default '0', PRIMARY KEY (`id_agente`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tagente_datos` ( @@ -56,7 +56,7 @@ CREATE TABLE `tagente_datos` ( `utimestamp` int(10) unsigned default '0', PRIMARY KEY (`id_agente_datos`), KEY `data_index2` (`id_agente`,`id_agente_modulo`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tagente_datos_inc` ( @@ -67,7 +67,7 @@ CREATE TABLE `tagente_datos_inc` ( `utimestamp` int(10) unsigned default '0', PRIMARY KEY (`id_adi`), KEY `data_inc_index_1` (`id_agente_modulo`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tagente_datos_string` ( @@ -80,7 +80,7 @@ CREATE TABLE `tagente_datos_string` ( PRIMARY KEY (`id_tagente_datos_string`), KEY `data_string_index_1` (`id_agente_modulo`), KEY `data_string_index_2` (`id_agente`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tagente_estado` ( @@ -99,14 +99,14 @@ CREATE TABLE `tagente_estado` ( PRIMARY KEY (`id_agente_estado`), KEY `status_index_1` (`id_agente_modulo`), KEY `status_index_2` (`id_agente_modulo`,`estado`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tmodule` ( `id_module` int(11) unsigned NOT NULL auto_increment, `name` varchar(100) NOT NULL default '', PRIMARY KEY (`id_module`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tagente_modulo` ( @@ -129,7 +129,7 @@ CREATE TABLE `tagente_modulo` ( `id_modulo` int(11) unsigned NULL default 0, PRIMARY KEY (`id_agente_modulo`, `id_agente`), KEY `tam_agente` (`id_agente`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `talert_snmp` ( @@ -150,7 +150,7 @@ CREATE TABLE `talert_snmp` ( `min_alerts` int(11) NOT NULL default '1', `internal_counter` int(2) unsigned NOT NULL default '0', PRIMARY KEY (`id_as`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `talerta` ( @@ -159,7 +159,7 @@ CREATE TABLE `talerta` ( `comando` varchar(100) default '', `descripcion` varchar(255) default '', PRIMARY KEY (`id_alerta`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `talerta_agente_modulo` ( @@ -184,7 +184,7 @@ CREATE TABLE `talerta_agente_modulo` ( `time_from` TIME default '00:00:00', `time_to` TIME default '00:00:00', PRIMARY KEY (`id_aam`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tattachment` ( @@ -195,7 +195,7 @@ CREATE TABLE `tattachment` ( `description` varchar(150) default '', `size` bigint(20) NOT NULL default '0', PRIMARY KEY (`id_attachment`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tconfig` ( @@ -203,7 +203,7 @@ CREATE TABLE `tconfig` ( `token` varchar(100) NOT NULL default '', `value` varchar(100) NOT NULL default '', PRIMARY KEY (`id_config`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tconfig_os` ( @@ -212,7 +212,7 @@ CREATE TABLE `tconfig_os` ( `description` varchar(250) default '', `icon_name` varchar(100) default '', PRIMARY KEY (`id_os`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tevento` ( @@ -227,7 +227,7 @@ CREATE TABLE `tevento` ( PRIMARY KEY (`id_evento`), KEY `indice_1` (`id_agente`,`id_evento`), KEY `indice_2` (`timestamp`,`id_evento`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tgrupo` ( @@ -237,7 +237,7 @@ CREATE TABLE `tgrupo` ( `parent` tinyint(4) NOT NULL default '-1', `disabled` tinyint(4) NOT NULL default '0', PRIMARY KEY (`id_grupo`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tincidencia` ( @@ -256,14 +256,14 @@ CREATE TABLE `tincidencia` ( `notify_email` TINYINT UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`id_incidencia`), KEY `incident_index_1` (`id_usuario`,`id_incidencia`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tlanguage` ( `id_language` varchar(6) NOT NULL default '', `name` varchar(100) NOT NULL default '', PRIMARY KEY (`id_language`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tlink` ( @@ -271,7 +271,7 @@ CREATE TABLE `tlink` ( `name` varchar(100) NOT NULL default '', `link` varchar(255) NOT NULL default '', PRIMARY KEY (`id_link`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tmensajes` ( @@ -283,14 +283,14 @@ CREATE TABLE `tmensajes` ( `subject` varchar(255) NOT NULL default '', `estado` int(10) unsigned NOT NULL default '0', PRIMARY KEY (`id_mensaje`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tmodule_group` ( `id_mg` bigint(20) unsigned NOT NULL auto_increment, `name` varchar(150) NOT NULL default '', PRIMARY KEY (`id_mg`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tnetwork_component` ( @@ -309,7 +309,7 @@ CREATE TABLE `tnetwork_component` ( `snmp_oid` varchar(400) NOT NULL, `id_module_group` tinyint(4) NOT NULL default '0', PRIMARY KEY (`id_nc`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tnetwork_component_group` ( @@ -317,7 +317,7 @@ CREATE TABLE `tnetwork_component_group` ( `name` varchar(200) NOT NULL default '', `parent` mediumint(9) NOT NULL default '0', PRIMARY KEY (`id_sg`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tnetwork_profile` ( @@ -325,7 +325,7 @@ CREATE TABLE `tnetwork_profile` ( `name` varchar(100) NOT NULL default '', `description` varchar(250) default '', PRIMARY KEY (`id_np`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tnetwork_profile_component` ( @@ -333,7 +333,7 @@ CREATE TABLE `tnetwork_profile_component` ( `id_nc` mediumint(8) unsigned NOT NULL default '0', `id_np` mediumint(8) unsigned NOT NULL default '0', PRIMARY KEY (`id_npc`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tnota` ( @@ -342,7 +342,7 @@ CREATE TABLE `tnota` ( `timestamp` tinyblob NOT NULL, `nota` mediumtext NOT NULL, PRIMARY KEY (`id_nota`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tnota_inc` ( @@ -350,12 +350,12 @@ CREATE TABLE `tnota_inc` ( `id_incidencia` mediumint(9) NOT NULL default '0', `id_nota` mediumint(9) NOT NULL default '0', PRIMARY KEY (`id_nota_inc`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `torigen` ( `origen` varchar(100) NOT NULL default '' -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tperfil` ( @@ -372,7 +372,7 @@ CREATE TABLE `tperfil` ( `alert_management` int(11) NOT NULL default '0', `pandora_management` int(11) NOT NULL default '0', PRIMARY KEY (`id_perfil`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `trecon_task` ( @@ -390,7 +390,7 @@ CREATE TABLE `trecon_task` ( `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; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tserver` ( @@ -409,7 +409,7 @@ CREATE TABLE `tserver` ( `recon_server` tinyint(3) unsigned NOT NULL default '0', `version` varchar(20) NOT NULL default '', PRIMARY KEY (`id_server`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tsesion` ( @@ -421,7 +421,7 @@ CREATE TABLE `tsesion` ( `fecha` datetime NOT NULL default '0000-00-00 00:00:00', `utimestamp` bigint(20) unsigned NOT NULL default '0', PRIMARY KEY (`ID_sesion`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `ttipo_modulo` ( @@ -431,7 +431,7 @@ CREATE TABLE `ttipo_modulo` ( `descripcion` varchar(100) NOT NULL default '', `icon` varchar(100) default NULL, PRIMARY KEY (`id_tipo`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `ttrap` ( @@ -448,7 +448,7 @@ CREATE TABLE `ttrap` ( `id_usuario` varchar(150) default '', `timestamp` datetime NOT NULL default '0000-00-00 00:00:00', PRIMARY KEY (`id_trap`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tusuario` ( @@ -460,7 +460,7 @@ CREATE TABLE `tusuario` ( `direccion` varchar(100) default '', `telefono` varchar(100) default '', `nivel` tinyint(1) NOT NULL default '0' -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tusuario_perfil` ( @@ -470,7 +470,7 @@ CREATE TABLE `tusuario_perfil` ( `id_grupo` int(11) NOT NULL default '0', `assigned_by` varchar(100) NOT NULL default '', PRIMARY KEY (`id_up`) -) ENGINE=InnoDB; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tnews` ( @@ -480,7 +480,7 @@ CREATE TABLE `tnews` ( `text` TEXT NOT NULL, `timestamp` DATETIME NOT NULL DEFAULT 0, PRIMARY KEY(`id_news`) -) ENGINE = InnoDB; +) ENGINE = InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tgraph` ( `id_graph` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, @@ -493,7 +493,7 @@ CREATE TABLE `tgraph` ( `private` tinyint(1) UNSIGNED NOT NULL default 0, `events` tinyint(1) UNSIGNED NOT NULL default 0, PRIMARY KEY(`id_graph`) -) ENGINE = InnoDB; +) ENGINE = InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tgraph_source` ( `id_gs` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, @@ -501,7 +501,7 @@ CREATE TABLE `tgraph_source` ( `id_agent_module` int(11) NOT NULL default 0, `weight` smallint(5) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY(`id_gs`) -) ENGINE = InnoDB; +) ENGINE = InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `treport` ( @@ -511,7 +511,7 @@ CREATE TABLE `treport` ( `description` TEXT NOT NULL, `private` tinyint(1) UNSIGNED NOT NULL default 0, PRIMARY KEY(`id_report`) -) ENGINE = InnoDB; +) ENGINE = InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `treport_content` ( `id_rc` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, @@ -524,7 +524,7 @@ CREATE TABLE `treport_content` ( `sla_min` int(11) NOT NULL default 0, `sla_limit` int(11) NOT NULL default 0, PRIMARY KEY(`id_rc`) -) ENGINE = InnoDB; +) ENGINE = InnoDB DEFAULT CHARSET=utf8; /* @@ -553,7 +553,7 @@ CREATE TABLE `tlayout` ( `height` INTEGER UNSIGNED NOT NULL default 0, `width` INTEGER UNSIGNED NOT NULL default 0, PRIMARY KEY(`id`) -) ENGINE = InnoDB; +) ENGINE = InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tlayout_data` ( `id` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, @@ -572,4 +572,4 @@ CREATE TABLE `tlayout_data` ( `label_color` varchar(20) DEFAULT "", `no_link_color` tinyint(1) UNSIGNED NOT NULL default 0, PRIMARY KEY(`id`) -) ENGINE = InnoDB; +) ENGINE = InnoDB DEFAULT CHARSET=utf8; diff --git a/pandora_console/upgrade.php b/pandora_console/upgrade.php index e35919934f..479adf2432 100644 --- a/pandora_console/upgrade.php +++ b/pandora_console/upgrade.php @@ -20,7 +20,7 @@ -Pandora FMS - Migration Wizard +Pandora FMS - Upgrade Wizard @@ -186,19 +186,22 @@ function random_name ($size){ function install_step1() { echo "
-

Pandora FMS migration wizard. Step #1 of 5

+

Pandora FMS upgrad wizard. Step #1 of 5

-

Welcome to Pandora FMS 1.3 migration Wizard

-

This wizard helps you to quick migrate Pandora FMS console in your system.This tool is only to migrate Pandora FMS 1.2 to Pandora FMS 1.3

+

Welcome to Pandora FMS 1.3 upgrade Wizard

+

This wizard helps you to quick upgrade Pandora FMS console in your system. This tool is only to +upgrade Pandora FMS 1.2 to Pandora FMS 1.3

For more information, please refer to documentation.

Pandora FMS Development Team -
Before start with migration process. Please STOP NOW all your Pandora FMS
"; +
Before start with upgrade process. Please STOP NOW all your Pandora FMS
"; if (file_exists("include/config.php")){ echo "
Warning: You already have a config.php file in this directory, please backup and move it before continue.
"; } - echo "
Warning: This migration tool will overwrite and change your existing Pandora FMS Database and only could be used to migrate fron Pandora FMS 1.2 to Pandora FMS 1.3. Before contine, please be sure that you have made a SQL backup using mysqldump system tool as described in documentation.
"; + echo "
Warning: This upgrade tool will overwrite and change your existing Pandora FMS +Database and only could be used to upgrade fron Pandora FMS 1.2 to Pandora FMS 1.3. Before contine, please be sure that you +have made a SQL backup using mysqldump system tool as described in documentation.
"; echo "
@@ -206,7 +209,7 @@ function install_step1() {
- +
@@ -219,7 +222,7 @@ function install_step1() { function install_step2() { echo "
-

Pandora FMS migration wizard. Step #2 of 5

+

Pandora FMS upgrade wizard. Step #2 of 5

"; echo "

Checking software dependencies

"; @@ -250,9 +253,9 @@ function install_step2() { dependencies. Please correct them or this wizard tool will not be able to finish your installation.

- Ignore it. Ignore it and go to Step #3"; + Ignore it. Ignore it and go to Step #3"; } else { - echo ""; + echo ""; } echo "
@@ -268,7 +271,7 @@ function install_step2() { function install_step3() { echo "
-

Pandora FMS migration wizard. Step #3 of 5

+

Pandora FMS upgrade wizard. Step #3 of 5

Environment and database setup

@@ -278,7 +281,7 @@ function install_step3() {

You need a user to modify and create database schema, this is usually the existant pandora user, you could check on config.php file of Pandora FMS 1.2 installation.

"; - echo "
+ echo "
DB User with privileges on MySQL
@@ -343,7 +346,7 @@ function install_step4() { $step1=0; $step2=0; $step3=0; $step4=0; $step5=0; $step6=0; $step7=0; echo "
-

Pandora FMS migration wizard. Step #4 of 5

+

Pandora FMS upgrade wizard. Step #4 of 5

Modifing database schema and adding data

This could take a while...please wait @@ -402,7 +405,7 @@ $BASE_URL="'.$url.'"; // Base URL
"; if ($everything_ok == 1) { - echo "

"; + echo "

"; } else { echo "
There was some problems. Installation is not completed.

Please correct failures, and restore original DB before trying again.

"; @@ -424,11 +427,11 @@ $BASE_URL="'.$url.'"; // Base URL function install_step5() { echo "
-

Pandora FMS migration wizard. Finished

+

Pandora FMS upgrade wizard. Finished

-

Migration complete

-

You now must delete manually installer and migration tool ('install.php, migrate.php') files for security before trying to access to your Pandora FMS console. +

Upgrade complete !

+

You now must delete manually installer and upgrade tool ('install.php, upgrade.php') files for security before trying to access to your Pandora FMS console.

Don't forget to check http://pandora.sourceforge.net for updates.

Click here to access to your Pandora FMS console