diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index d4af8b0d05..926b5fc198 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2007-08-06 Sancho Lerena + + * CSS Fixes (min height). + + * pandoradb_data.sql: Added some missing default alerts, fixed others. + 2007-08-02 Sancho Lerena * Fixed bug #1757084 for Data Server lag check. diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 8b0eac91a6..ec7a83f44e 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -178,6 +178,7 @@ div#page { } div#main { width: 780px; + min-height: 500px; float: right; padding-left: 0px; padding-top: 0px; diff --git a/pandora_console/include/styles/pandora_red.css b/pandora_console/include/styles/pandora_red.css index 4d74aae9e7..c70a66a34e 100644 --- a/pandora_console/include/styles/pandora_red.css +++ b/pandora_console/include/styles/pandora_red.css @@ -172,6 +172,7 @@ div#page { } div#main { width: 780px; + min-height: 500px; float: right; padding-left: 0px; padding-top: 0px; diff --git a/pandora_console/index.php b/pandora_console/index.php index 4bba613b92..9a2ef24b20 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -24,14 +24,14 @@ // Silk icon set 1.3 (cc) Mark James, http://www.famfamfam.com/lab/icons/silk/ // Pandora FMS 1.x uses Pear Image::Graph code -//Pandora Version -$build_version="PC070802"; +//Pandora Version, if not defined here it would take from config.php +$build_version="PC070806"; $pandora_version="v1.3-dev"; global $build_version; global $pandora_version; // Set to 1 to do not check for installer or config file (for development!). -$develop_bypass = 1; +$develop_bypass = 0; if ($develop_bypass != 1){ // If no config file, automatically try to install diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index ffd917ae4c..d1bdb02119 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -5,7 +5,8 @@ /*!40000 ALTER TABLE `talerta` DISABLE KEYS */; LOCK TABLES `talerta` WRITE; -INSERT INTO `talerta` VALUES (1,'eMail','echo _field3_ | sendmail -s _field2_ _field1_','Send email from Pandora Server. mail is a default command on all "standard" Unix systems, using:\r\n_field1_ as destination email address, and\r\n_field2_ as subject for message. \r\n_field3_ as text of message.'),(2,'LogFile','echo _timestamp_ pandora _field1_ _field2_ >> /var/log/pandora_alert.log','This is a default alert to write alerts in a standard ASCII plaintext log file in /var/log/pandora_alert.log\r\n'),(3,'Internal Audit','','This alert save alert in Pandora interal audit system. Fields are static and only _field1_ is used.'),(4,'SNMP Trap','/usr/bin/snmptrap -v 1 -c trap_public 192.168.0.4 1.1.1.1.1.1.1.1 _agent_ _field1_','Send a SNMPTRAP to 192.168.0.4. Please review config and adapt to your needs, this is only a sample, not functional itself.'),(5,'SMS Text','echo _field2_ | mail -s PANDORA_field1_ slerena@vodafone.es','Send SMS via e-mail gateway. Use field1 for a short SMS text (35 chars) and field 2 for text message (full SMS)'),(6,'Syslog','/usr/bin/logger -pri daemon.alert Pandora Alert _agent_ _field1_ _field2_','Uses field1 and field2 to generate Syslog alert in facility "daemon" with "alert" level.'),(7,'Sound Alert','/usr/bin/play /usr/share/sounds/alarm.wav',''); +INSERT INTO `talerta` VALUES (1,'eMail','echo _field3_ | sendmail -s _field2_ _field1_','Send email from Pandora Server. mail is a default command on all "standard" Unix systems, using:\r\n_field1_ as destination email address, and\r\n_field2_ as subject for message. \r\n_field3_ as text of message.'),(2,'LogFile','echo _timestamp_ pandora _field1_ _field2_ >> /var/log/pandora_alert.log','This is a default alert to write alerts in a standard ASCII plaintext log file in /var/log/pandora_alert.log\r\n'),(3,'Internal Audit','','This alert save alert in Pandora interal audit system. Fields are static and only _field1_ is used.'),(4,'SNMP Trap','/usr/bin/snmptrap -v 1 -c trap_public 192.168.0.4 1.1.1.1.1.1.1.1 _agent_ _field1_','Send a SNMPTRAP to 192.168.0.4. Please review config and adapt to your needs, this is only a sample, not functional itself.'),(5,'SMS Text','echo _field2_ | mail -s PANDORA_field1_ slerena@vodafone.es','Send SMS via e-mail gateway. Use field1 for a short SMS text (35 chars) and field 2 for text message (full SMS)'),(6,'Syslog','logger -p daemon.alert Pandora Alert _agent_ _field1_ _field2_','Uses field1 and field2 to generate Syslog alert in facility "daemon" with "alert" level.'),(7,'Sound Alert','/usr/bin/play /usr/share/sounds/alarm.wav',''), (8,'Jabber Alert','echo _field3_ | sendxmpp -r _field1_ --chatroom _field2_','Send jabber alert to chat room in a predefined server (configure first .sendxmpprc file). Uses field3 as text message, field1 as useralias for source message, and field2 for chatroom name'), (9, 'Synthetized Speech', 'flite -t _FIELD2_','Uses commandline voice synthetizer to "speak" text given as parameter 1 and 2'); + UNLOCK TABLES; /*!40000 ALTER TABLE `talerta` ENABLE KEYS */;