diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index bcb90ac590..f09f6d2c35 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,7 @@ +2007-04-18 Raul Mateos <raulofpandora@gmail.com> + + * pandoradb_data.sql, pandoradb.sql: Fixed small warnings. + 2007-04-18 Sancho Lerena <slerena@artica.es> * include/styles/pandora.css: Added frame and changed basic form input diff --git a/pandora_console/include/config.php b/pandora_console/include/config.php index 24d7e47de2..d4f634377e 100644 --- a/pandora_console/include/config.php +++ b/pandora_console/include/config.php @@ -1,8 +1,8 @@ <?PHP // Begin of automatic config file $dbname="pandora"; // MySQL DataBase name -$dbuser="root"; -$dbpassword="none"; +$dbuser="pandora"; +$dbpassword="pandora"; $dbhost="localhost"; // DB Host $config_homedir="/var/www/pandora_console/"; // Config homedir $BASE_URL="http://localhost/pandora_console"; // Base URL diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 5c52207d9a..5b7342e5f4 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -93,7 +93,7 @@ CREATE TABLE `tagente` ( `direccion` varchar(100) default '', `comentarios` varchar(255) default '', `id_grupo` int(10) unsigned NOT NULL default '0', - `ultimo_contacto` datetime NOT NULL default '2004-01-01 00:00:00', + `ultimo_contacto` datetime NOT NULL default '0000-00-00 00:00:00', `modo` tinyint(1) NOT NULL default '0', `intervalo` int(11) NOT NULL default '300', `id_os` int(10) unsigned default '0', @@ -132,7 +132,7 @@ CREATE TABLE `tagente_datos_inc` ( CREATE TABLE `tagente_datos_string` ( `id_tagente_datos_string` bigint(20) unsigned NOT NULL auto_increment, `id_agente_modulo` int(11) NOT NULL default '0', - `datos` tinytext NOT NULL default '', + `datos` tinytext NOT NULL, `timestamp` datetime NOT NULL default '0000-00-00 00:00:00', `id_agente` bigint(4) unsigned NOT NULL default '0', `utimestamp` int(10) unsigned NOT NULL default 0, @@ -163,7 +163,7 @@ CREATE TABLE `tagente_estado` ( CREATE TABLE `tmodule` ( `id_module` int(11) unsigned NOT NULL auto_increment, `name` varchar(100) NOT NULL default '', - PRIMARY KEY (`id_module`), + PRIMARY KEY (`id_module`) ) ENGINE=InnoDB; @@ -203,7 +203,7 @@ CREATE TABLE `talert_snmp` ( `oid` varchar(255) NOT NULL default '', `time_threshold` int(11) NOT NULL default '0', `times_fired` int(2) unsigned NOT NULL default '0', - `last_fired` datetime NOT NULL default '2004-01-01 00:00:00', + `last_fired` datetime NOT NULL default '0000-00-00 00:00:00', `max_alerts` int(11) NOT NULL default '1', `min_alerts` int(11) NOT NULL default '1', `internal_counter` int(2) unsigned NOT NULL default '0', @@ -226,12 +226,12 @@ CREATE TABLE `talerta_agente_modulo` ( `id_alerta` int(11) NOT NULL default '0', `al_campo1` varchar(255) default '', `al_campo2` varchar(255) default '', - `al_campo3` mediumtext default '', + `al_campo3` mediumtext NOT NULL, `descripcion` varchar(255) default '', `dis_max` double(18,2) default NULL, `dis_min` double(18,2) default NULL, `time_threshold` int(11) NOT NULL default '0', - `last_fired` datetime NOT NULL default '2004-01-01 00:00:00', + `last_fired` datetime NOT NULL default '0000-00-00 00:00:00', `max_alerts` int(4) NOT NULL default '1', `times_fired` int(11) NOT NULL default '0', `module_type` int(11) NOT NULL default '0', @@ -332,7 +332,7 @@ CREATE TABLE `tmensajes` ( `id_usuario_origen` varchar(100) NOT NULL default '', `id_usuario_destino` varchar(100) NOT NULL default '', `mensaje` tinytext NOT NULL, - `timestamp` datetime NOT NULL default '2004-01-01 00:00:00', + `timestamp` datetime NOT NULL default '0000-00-00 00:00:00', `subject` varchar(255) NOT NULL default '', `estado` int(10) unsigned NOT NULL default '0', PRIMARY KEY (`id_mensaje`) @@ -530,7 +530,7 @@ 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 DEFAULT '', + `text` TEXT NOT NULL, `utimestamp` DATETIME NOT NULL DEFAULT 0, PRIMARY KEY(`id_news`) ) ENGINE = InnoDB; \ No newline at end of file diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 21fdc5b329..00f4a83e03 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -27,7 +27,7 @@ UNLOCK TABLES; /*!40000 ALTER TABLE `tconfig_os` DISABLE KEYS */; LOCK TABLES `tconfig_os` WRITE; -INSERT INTO `tconfig_os` VALUES (1,'Linux','Linux: All versions','so_linux.gif'),(2,'Solaris','Sun Solaris','so_solaris.gif'),(3,'AIX','IBM AIX','so_aix.gif'),(4,'BSD','OpenBSD, FreeBSD and Others','so_bsd.gif'),(5,'HP-UX','HPUX Unix OS','so_hpux.gif'),(6,'BeOS','BeOS','so_beos.gif'),(7,'Cisco','CISCO IOS','so_cisco.gif'),(8,'MacOS','MAC OS','so_mac.gif'),(9,'Windows','Microsoft Windows OS','so_win.gif'),(10,'Other','Other SO','so_other.gif'),(11,'Network','Pandora Network Agent','network.gif'); +INSERT INTO `tconfig_os` VALUES (1,'Linux','Linux: All versions','so_linux.gif'),(2,'Solaris','Sun Solaris','so_solaris.gif'),(3,'AIX','IBM AIX','so_aix.gif'),(4,'BSD','OpenBSD, FreeBSD and Others','so_bsd.gif'),(5,'HP-UX','HP-UX Unix OS','so_hpux.gif'),(6,'BeOS','BeOS','so_beos.gif'),(7,'Cisco','CISCO IOS','so_cisco.gif'),(8,'MacOS','MAC OS','so_mac.gif'),(9,'Windows','Microsoft Windows OS','so_win.gif'),(10,'Other','Other SO','so_other.gif'),(11,'Network','Pandora Network Agent','network.gif'); UNLOCK TABLES; /*!40000 ALTER TABLE `tconfig_os` ENABLE KEYS */; @@ -132,7 +132,7 @@ UNLOCK TABLES; /*!40000 ALTER TABLE `tusuario` DISABLE KEYS */; LOCK TABLES `tusuario` WRITE; -INSERT INTO `tusuario` VALUES ('admin','Default Admin','1da7ee7d45b96d0e1f45ee4ee23da560','Admin Pandora','2007-03-27 18:59:39','admin_pandora@nowhere.net','555-555-555',1),('demo','Demo user','fe01ce2a7fbac8fafaed7c982a04e229','Please don\\'t change anything in this user, so other users can connect with it.\r\n\r\nThanks.','2006-04-20 13:00:05','demo@nowhere.net','+4555435435',0); +INSERT INTO `tusuario` VALUES ('admin','Default Admin','1da7ee7d45b96d0e1f45ee4ee23da560','Admin Pandora','2007-03-27 18:59:39','admin_pandora@nowhere.net','555-555-555',1),('demo','Demo user','fe01ce2a7fbac8fafaed7c982a04e229','Please don\\'t change anything in this user, so other users can connect with it.\r\n\r\nThanks.','2007-03-20 13:00:05','demo@nowhere.net','+4555435435',0); UNLOCK TABLES; /*!40000 ALTER TABLE `tusuario` ENABLE KEYS */;