[packages/percona-monitoring-plugins] upstream project renamed again, to percona-monitoring-plugins, version 1.0.1
glen
glen at pld-linux.org
Mon Oct 29 22:35:00 CET 2012
commit 6a96e6d377c9c508703bc4b3593cbc863fc50c3a
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Oct 28 22:17:18 2012 +0200
upstream project renamed again, to percona-monitoring-plugins, version 1.0.1
cacti-template-mysql.spec | 36 ++++++++++++++++++++----------------
config.patch | 8 ++++----
paths.patch | 14 +++++++-------
3 files changed, 31 insertions(+), 27 deletions(-)
---
diff --git a/cacti-template-mysql.spec b/cacti-template-mysql.spec
index 2307ce6..9e0d929 100644
--- a/cacti-template-mysql.spec
+++ b/cacti-template-mysql.spec
@@ -1,5 +1,5 @@
# TODO
-# - how to package other ssh based templates?
+# - how to package other templates:
# - Apache
# - JMX
# - Memcached
@@ -12,17 +12,18 @@
%define template mysql
Summary: MySQL cacti templates
Name: cacti-template-%{template}
-Version: 1.1.8
-Release: 3
+Version: 1.0.1
+Release: 1
+Epoch: 1
License: GPL v2
Group: Applications/WWW
-Source0: http://mysql-cacti-templates.googlecode.com/files/better-cacti-templates-%{version}.tar.gz
-# Source0-md5: c34e66af5091bc02b081a446dbe87f53
+Source0: http://www.percona.com/downloads/percona-monitoring-plugins/percona-monitoring-plugins-%{version}.tar.gz
+# Source0-md5: 03513138a2e0490d24cd348d85e92333
Source1: config.php
Source2: ssh_config.php
Patch0: config.patch
Patch1: paths.patch
-URL: http://code.google.com/p/mysql-cacti-templates/
+URL: http://www.percona.com/software/percona-monitoring-plugins
BuildRequires: rpmbuild(macros) >= 1.630
Requires: cacti >= 0.8.7g-6
Conflicts: cacti-spine < 0.8.7e-3
@@ -41,7 +42,7 @@ This is a set of templates for monitoring MySQL servers with Cacti.
%package -n cacti-template-redis
Summary: Cacti templates for graphing Redis
Group: Applications/WWW
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
# redis template uses nc
Requires: nc
@@ -49,12 +50,13 @@ Requires: nc
This is a set of templates for monitoring Redis servers with Cacti.
%prep
-%setup -qn better-cacti-templates-%{version}
+%setup -qn percona-monitoring-plugins-%{version}
%patch0 -p1
%patch1 -p1
+cd cacti
# rename to include fixed names
-for xml in templates/cacti_host_template_x_*.xml; do
+for xml in templates/cacti_host_template_*.xml; do
normalized=${xml%_0.8.*-sver%{version}.xml}.xml
mv $xml $normalized
done
@@ -63,11 +65,12 @@ done
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{resourcedir},%{scriptsdir},%{cachedir}}
+cd cacti
# this is what is needed for mysql templates
install -p scripts/ss_get_mysql_stats.php $RPM_BUILD_ROOT%{scriptsdir}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ss_get_mysql_stats.php
-cp -p templates/cacti_host_template_x_mysql_server_ht.xml \
+cp -p templates/cacti_host_template_percona_mysql_server_ht.xml \
$RPM_BUILD_ROOT%{resourcedir}
# these are additional ssh-based templates (not really using ssh, just the
@@ -76,11 +79,11 @@ install -p scripts/ss_get_by_ssh.php $RPM_BUILD_ROOT%{scriptsdir}
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ss_get_by_ssh.php
# redis template
-cp -p templates/cacti_host_template_x_redis_server_ht.xml \
+cp -p templates/cacti_host_template_percona_redis_server_ht.xml \
$RPM_BUILD_ROOT%{resourcedir}
%post
-%cacti_import_template %{resourcedir}/cacti_host_template_x_mysql_server_ht.xml
+%cacti_import_template %{resourcedir}/cacti_host_template_percona_mysql_server_ht.xml
%preun
if [ "$1" = 0 ]; then
@@ -88,20 +91,21 @@ if [ "$1" = 0 ]; then
fi
%post -n cacti-template-redis
-%cacti_import_template %{resourcedir}/cacti_host_template_x_redis_server_ht.xml
+%cacti_import_template %{resourcedir}/cacti_host_template_percona_redis_server_ht.xml
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc COPYING README Changelog
+%doc Changelog
%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ss_get_mysql_stats.php
%attr(755,root,root) %{scriptsdir}/ss_get_mysql_stats.php
-%{resourcedir}/cacti_host_template_x_mysql_server_ht.xml
+%{resourcedir}/cacti_host_template_percona_mysql_server_ht.xml
%attr(770,root,http) %dir %{cachedir}
%files -n cacti-template-redis
+%defattr(644,root,root,755)
%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
-%{resourcedir}/cacti_host_template_x_redis_server_ht.xml
+%{resourcedir}/cacti_host_template_percona_redis_server_ht.xml
diff --git a/config.patch b/config.patch
index c4b5365..125a9e6 100644
--- a/config.patch
+++ b/config.patch
@@ -1,5 +1,5 @@
---- better-cacti-templates-1.1.8-orig/scripts/ss_get_mysql_stats.php 2011-05-25 12:17:25.659963610 +0200
-+++ better-cacti-templates-1.1.8/scripts/ss_get_mysql_stats.php 2011-05-25 12:19:29.509003208 +0200
+--- better-cacti-templates-1.1.8-orig/cacti/scripts/ss_get_mysql_stats.php 2011-05-25 12:17:25.659963610 +0200
++++ better-cacti-templates-1.1.8/cacti/scripts/ss_get_mysql_stats.php 2011-05-25 12:19:29.509003208 +0200
@@ -68,6 +68,10 @@
# ============================================================================
# Include settings from an external config file (issue 39).
@@ -11,8 +11,8 @@
if ( file_exists(__FILE__ . '.cnf' ) ) {
require(__FILE__ . '.cnf');
}
---- better-cacti-templates-1.1.8/scripts/ss_get_by_ssh.php~ 2011-12-21 18:26:28.000000000 +0200
-+++ better-cacti-templates-1.1.8/scripts/ss_get_by_ssh.php 2011-12-21 18:29:47.234354418 +0200
+--- better-cacti-templates-1.1.8/cacti/scripts/ss_get_by_ssh.php~ 2011-12-21 18:26:28.000000000 +0200
++++ better-cacti-templates-1.1.8/cacti/scripts/ss_get_by_ssh.php 2011-12-21 18:29:47.234354418 +0200
@@ -66,6 +66,10 @@
# ============================================================================
# Include settings from an external config file (issue 39).
diff --git a/paths.patch b/paths.patch
index 887adb1..dd28185 100644
--- a/paths.patch
+++ b/paths.patch
@@ -1,5 +1,5 @@
---- better-cacti-templates-1.1.8-orig/scripts/ss_get_by_ssh.php 2011-05-25 12:17:25.693298481 +0200
-+++ better-cacti-templates-1.1.8/scripts/ss_get_by_ssh.php 2011-05-25 12:23:51.021048978 +0200
+--- better-cacti-templates-1.1.8-orig/cacti/scripts/ss_get_by_ssh.php 2011-05-25 12:17:25.693298481 +0200
++++ better-cacti-templates-1.1.8/cacti/scripts/ss_get_by_ssh.php 2011-05-25 12:23:51.021048978 +0200
@@ -38,10 +38,10 @@
# ============================================================================
$ssh_user = 'cacti'; # SSH username
@@ -13,14 +13,14 @@
$poll_time = 300; # Adjust to match your polling interval.
$use_ss = FALSE; # Whether to use the script server or not
$use_ssh = TRUE; # Whether to connect via SSH or not (default yes).
---- better-cacti-templates-1.1.8-orig/scripts/ss_get_mysql_stats.php 2011-05-25 12:17:25.659963610 +0200
-+++ better-cacti-templates-1.1.8/scripts/ss_get_mysql_stats.php 2011-05-25 12:22:36.747629448 +0200
-@@ -46,7 +46,7 @@
+--- percona-monitoring-plugins-1.0.1/cacti/scripts/ss_get_mysql_stats.php~ 2012-10-28 22:08:12.000000000 +0200
++++ percona-monitoring-plugins-1.0.1/cacti/scripts/ss_get_mysql_stats.php 2012-10-28 22:08:41.452510099 +0200
+@@ -33,7 +33,7 @@
$mysql_ssl = FALSE; # Whether to use SSL to connect to MySQL.
- $heartbeat = ''; # db.tbl in case you use mk-heartbeat from Maatkit.
+ $heartbeat = ''; # db.tbl if you use pt-heartbeat from Percona Toolkit.
-$cache_dir = '/tmp'; # If set, this uses caching to avoid multiple calls.
+$cache_dir = '/var/cache/cacti/mysql_stats'; # If set, this uses caching to avoid multiple calls.
$poll_time = 300; # Adjust to match your polling interval.
+ $timezone = null; # If not set, uses the system default. Example: "UTC"
$chk_options = array (
- 'innodb' => true, # Do you want to check InnoDB statistics?
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/percona-monitoring-plugins.git/commitdiff/0b9590ccd684856181938a29e50602b779209808
More information about the pld-cvs-commit
mailing list