From 4e5bbd48c3b798aac4660116d68cbab6b5a5095d Mon Sep 17 00:00:00 2001 From: slerena Date: Wed, 19 Aug 2009 02:34:06 +0000 Subject: [PATCH] 2009-08-18 Sancho Lerena * pandora_console.spec: A lot of changes, included new dependencies (thinking in SUSE 11), and a lot of corrected stuff. Now works 100%. * pandoradb_data.sql: Minor updates, version, new SMS alert, new SO type (octopus). git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1864 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 +++ pandora_console/pandora_console.spec | 84 +++++----------------------- pandora_console/pandoradb_data.sql | 13 ++--- 3 files changed, 30 insertions(+), 76 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 2fabde0e19..16c5b8763a 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2009-08-18 Sancho Lerena + + * pandora_console.spec: A lot of changes, included new dependencies (thinking + in SUSE 11), and a lot of corrected stuff. Now works 100%. + + * pandoradb_data.sql: Minor updates, version, new SMS alert, new SO type + (octopus). + + 2009-08-18 Miguel de Dios * include/functions_config.php: add to save the attachment_store config value. diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec index 20fe34f1b9..98e94f355c 100755 --- a/pandora_console/pandora_console.spec +++ b/pandora_console/pandora_console.spec @@ -1,49 +1,14 @@ # # Pandora FMS Console # -%define name PandoraFMS_Console +%define name pandorafms_console %define version 3.0.0 - - %define httpd_name httpd # User and Group under which Apache is running -# Red Hat: apache:apache -%define httpd_user apache -%define httpd_group apache -# OpenSUSE: wwwrun:www -%if "%{_vendor}" == "suse" - %define httpd_name apache2 - %define httpd_user wwwrun - %define httpd_group www -%endif +%define httpd_name apache2 +%define httpd_user wwwrun +%define httpd_group www -# Red Hat -# Apache server is packaged under the name of: -# - apache: up to Red Hat 9.0, FC6 and Red Hat Enterprise 2.1 -# - httpd: after these releases above -%define is_rh7 0 -%define is_el2 0 -%define is_centos2 0 -%define is_fedora 0 -%if %(test -f "/etc/redhat-release" && echo 1 || echo 0) - %define is_rh7 %(test -n "`cat /etc/redhat-release | grep '(Valhalla)'`" && echo 1 || echo 0) - %define is_el2 %(test -n "`cat /etc/redhat-release | grep '(Pensacola)'`" && echo 1 || echo 0) - %define is_centos2 %(test -n "`cat /etc/redhat-release | grep 'CentOS release 2'`" && echo 1 || echo 0) - %define is_fedora %(test -n "`cat /etc/redhat-release | grep 'Fedora'`" && echo 1 || echo 0) -%endif -%define is_apache 0 -%if %{is_rh7} -%define is_apache 1 -%endif -%if %{is_el2} -%define is_apache 1 -%endif -%if %{is_centos2} -%define is_apache 1 -%if %{is_fedora} -%define is_apache 1 -%endif -%endif # Evaluate PHP version %define phpver_lt_430 %(out=`rpm -q --queryformat='%{VERSION}' php` 2>&1 >/dev/null || out=0 ; out=`echo $out | tr . : | sed s/://g` ; if [ $out -lt 430 ] ; then out=1 ; else out=0; fi ; echo $out) @@ -56,41 +21,21 @@ Vendor: Artica ST Source0: %{name}-%{version}.tar.gz URL: http://www.pandorafms.com Group: Productivity/Networking/Web/Utilities -Packager: Manuel Arostegui - -%if "%{_vendor}" == "suse" +Packager: Manuel Arostegui Prefix: /srv/www/htdocs -%else -Prefix: /var/www/html -%endif BuildRoot: %{_tmppath}/%{name} BuildArchitectures: noarch - AutoReq: 0 -%if "%{_vendor}" == "suse" Requires: apache2 Requires: php >= 4.3.0 -Requires: php-gd, php-snmp, php-pear -Requires: mysql, php-mysql -Requires: graphviz - -%else -%if %{is_apache} -Requires: apache -%else -Requires: httpd -%endif -Requires: httpd mysql-server php-pear php-mysql php-pear-DB php-gd php-snmp php-ldap php-mbstring net-snmp-perl net-snmp-utils graphviz-php -%endif - +Requires: php5-gd, php5-snmp, php5-pear, php5-json, php5-gettext +Requires: php5-mysql, php5-ldap, php5-mbstring, php5 +Requires: graphviz, xorg-x11-fonts-core +Requires: php-pear-db php-pear-xml_rpc Provides: %{name}-%{version} %description -The Web Console is a web application that allows to see graphical reports, state of every agent, also to -access to the information sent by the agent, to see every monitored parameter and to see its evolution -throughout the time, to form the different nodes, groups and users of the system. It is the part that -interacts with the final user, and that will allows you to administer the system. - +The Web Console is a web application that allows to see graphical reports, state of every agent, also to access to the information sent by the agent, to see every monitored parameter and to see its evolution throughout the time, to form the different nodes, groups and users of the system. It is the part that interacts with the final user, and that will allows you to administer the system. %prep rm -rf $RPM_BUILD_ROOT @@ -102,6 +47,7 @@ rm -rf $RPM_BUILD_ROOT %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{prefix}/pandora_console +mkdir -p $RPM_BUILD_ROOT/var/spool/pandora/data_in cp -aRf * $RPM_BUILD_ROOT%{prefix}/pandora_console if [ -f $RPM_BUILD_ROOT%{prefix}/pandora_console/pandora_console.spec ] ; then rm $RPM_BUILD_ROOT%{prefix}/pandora_console/pandora_console.spec @@ -109,10 +55,8 @@ fi %clean rm -rf $RPM_BUILD_ROOT -%post -echo "Please, now, point your browser to http://your_ip_address/pandora_console/install.php and follow all the steps described on it." -# +%post # Has an install already been done, if so we only want to update the files # push install.php aside so that the console works immediately using existing # configuration. @@ -120,10 +64,12 @@ echo "Please, now, point your browser to http://your_ip_address/pandora_console/ if [ -f %{prefix}/pandora_console/include/config.php ] ; then mv %{prefix}/pandora_console/install.php %{prefix}/pandora_console/install.done else - pear install DB echo "Please, now, point your browser to http://your_IP_address/pandora_console/install.php and follow all the steps described on it." fi %files %defattr(0644,%{httpd_user},%{httpd_group},0755) %docdir %{prefix}/pandora_console/docs %{prefix}/pandora_console + +%defattr(770,pandora,www) +/var/spool/pandora/data_in diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index e6572fdb67..258b6de352 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -21,8 +21,6 @@ -- and fails creating database !!! - --- -- Dumping data for table `talert_commands` -- @@ -34,7 +32,7 @@ INSERT INTO `talert_commands` VALUES (5,'SNMP Trap','/usr/bin/snmptrap -v 1 -c t INSERT INTO `talert_commands` VALUES (6,'Syslog','logger -p daemon.alert Pandora Alert _agent_ _data_ _field1_ _field2_','Uses field1 and field2 to generate Syslog alert in facility daemon with "alert" level.', 0); INSERT INTO `talert_commands` VALUES (7,'Sound Alert','/usr/bin/play /usr/share/sounds/alarm.wav','', 0); INSERT INTO `talert_commands` VALUES (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', 0); - +INSERT INTO `talert_commands` VALUES (9,'SMS','sendsms _field1_ _field2_','Send SMS using the Pandora FMS standard SMS device, using smstools. Uses field2 as text message, field1 as destination phone (include international prefix!)', 0); -- -- Dumping data for table `tconfig` @@ -48,8 +46,8 @@ INSERT INTO `tconfig` VALUES (5,'days_compact','15'), (6,'graph_res','5'), (7,'step_compact','1'), -(8,'db_scheme_version','2.1-dev'), -(9,'db_scheme_build','PD90121'), +(8,'db_scheme_version','3.0-dev'), +(9,'db_scheme_build','PD90819'), (13,'show_unknown','0'), (14,'show_lastalerts','1'), (15,'style','pandora'), @@ -83,8 +81,9 @@ INSERT INTO `tconfig_os` VALUES (8,'MacOS','MAC OS','so_mac.png'), (9,'Windows','Microsoft Windows OS','so_win.png'), (10,'Other','Other SO','so_other.png'), -(11,'Network','Pandora Network Agent','network.png'), -(12,'Web Server','Web Server/Application','network.png'); +(11,'Network','Pandora FMS Network Agent','network.png'), +(12,'Web Server','Web Server/Application','network.png'), +(13,'Octopus','Pandora FMS Hardware Agent','network.png'); UNLOCK TABLES;