add apache template

diff --git a/percona-monitoring-plugins.spec b/percona-monitoring-plugins.spec
index dfa8b858160749d6a2e6f7878fdb4efd23f21cea..a8a91f7f8516bc46f4eb39a40b30b5feef92da9d 100644 (file)
--- a/percona-monitoring-plugins.spec
+++ b/percona-monitoring-plugins.spec
@@ -1,7 +1,6 @@
 # TODO
 # - cacti: package other templates:
 #   http://www.percona.com/doc/percona-monitoring-plugins/1.1/#templates-for-cacti
-# - Apache
 # - JMX
 # - MongoDB
 # - Nginx
@@ -12,7 +11,7 @@
 Summary:       MySQL cacti templates
 Name:          percona-monitoring-plugins
 Version:       1.1.3
-Release:       0.2
+Release:       0.4
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       http://www.percona.com/redir/downloads/percona-monitoring-plugins/LATEST/%{name}-%{version}.tar.gz
@@ -37,6 +36,17 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %description
 This is a set of templates for monitoring MySQL servers with Cacti.
 
+%package -n cacti-template-apache
+Summary:       Apache Stats
+Group:         Applications/WWW
+Requires:      %{name} = %{version}-%{release}
+Requires:      nc
+# mark obsoletes so ftp admin knows to remove old src.rpm once this package lands
+Obsoletes:     cacti-template-apache < 1.1
+
+%description -n cacti-template-apache
+Apache Stats for Cacti (PHP Script Server Version).
+
 %package -n cacti-template-memcached
 Summary:       Memcached Cacti Template
 Group:         Applications/WWW
@@ -113,6 +123,13 @@ cp -p templates/cacti_host_template_percona_redis_server_ht.xml \
 cp -p templates/cacti_host_template_percona_memcached_server_ht.xml \
        $RPM_BUILD_ROOT%{resourcedir}
 
+# apache template
+cp -p templates/cacti_host_template_percona_apache_server_ht.xml \
+       $RPM_BUILD_ROOT%{resourcedir}
+
+%post -n cacti-template-apache
+%cacti_import_template %{resourcedir}/cacti_host_template_percona_apache_server_ht.xml
+
 %post -n cacti-template-memcached
 %cacti_import_template %{resourcedir}/cacti_host_template_percona_memcached_server_ht.xml
 
@@ -136,6 +153,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ss_get_by_ssh.php
 %attr(755,root,root) %{scriptsdir}/ss_get_by_ssh.php
 
+%files -n cacti-template-apache
+%defattr(644,root,root,755)
+%{resourcedir}/cacti_host_template_percona_apache_server_ht.xml
+
 %files -n cacti-template-memcached
 %defattr(644,root,root,755)
 %{resourcedir}/cacti_host_template_percona_memcached_server_ht.xml