packages: nagios-plugin-check_mysql_replication/nagios-plugin-check_mysql_r...

glen glen at pld-linux.org
Tue Sep 8 11:22:21 CEST 2009


Author: glen                         Date: Tue Sep  8 09:22:21 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add more generic config; rel 4

---- Files affected:
packages/nagios-plugin-check_mysql_replication:
   nagios-plugin-check_mysql_replication-defaultpass.patch (1.1 -> 1.2) , nagios-plugin-check_mysql_replication.spec (1.11 -> 1.12) , check_mysql_replication.cfg (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_mysql_replication/nagios-plugin-check_mysql_replication-defaultpass.patch
diff -u packages/nagios-plugin-check_mysql_replication/nagios-plugin-check_mysql_replication-defaultpass.patch:1.1 packages/nagios-plugin-check_mysql_replication/nagios-plugin-check_mysql_replication-defaultpass.patch:1.2
--- packages/nagios-plugin-check_mysql_replication/nagios-plugin-check_mysql_replication-defaultpass.patch:1.1	Wed Dec 27 14:24:49 2006
+++ packages/nagios-plugin-check_mysql_replication/nagios-plugin-check_mysql_replication-defaultpass.patch	Tue Sep  8 11:22:16 2009
@@ -1,11 +1,11 @@
---- ./check_mysql_replication.pl~	2006-12-27 15:20:05.000000000 +0200
-+++ ./check_mysql_replication.pl	2006-12-27 15:20:50.066268435 +0200
+--- ./check_mysql_replication~	2006-12-27 15:20:05.000000000 +0200
++++ ./check_mysql_replication	2006-12-27 15:20:50.066268435 +0200
 @@ -44,7 +44,7 @@
  
  # $Id$
  
 -my $options = { 'slave-port' => 3306, 'slave' => 'slavehost', 'crit' => 0.5, 'warn' => 0.1 , 'slave-user' => 'repl', 'slave-pass' => 'password', 'debug' => 0, 'table-rows-diff-absolute-crit' => 10, 'table-rows-diff-absolute-warn' => 5};
-+my $options = { 'slave-port' => 3306, 'slave' => 'slavehost', 'crit' => 0.5, 'warn' => 0.1 , 'slave-user' => 'repl', 'slave-pass' => '', 'debug' => 0, 'table-rows-diff-absolute-crit' => 10, 'table-rows-diff-absolute-warn' => 5};
++my $options = { 'slave-port' => 3306, 'slave' => '', 'crit' => 0.5, 'warn' => 0.1 , 'slave-user' => 'replica', 'slave-pass' => '', 'debug' => 0, 'table-rows-diff-absolute-crit' => 10, 'table-rows-diff-absolute-warn' => 5};
  GetOptions($options, "slave=s", "slave-user=s", "slave-pass=s", "master=s", "master-port=i", "master-user=s", "master-pass=s", "crit=s", "warn=s", "help", "slave-port=i", "debug=i", "version", "check-random-database", "table-rows-diff-absolute-crit=i", "table-rows-diff-absolute-warn=i");
  my $max_binlog;
  

================================================================
Index: packages/nagios-plugin-check_mysql_replication/nagios-plugin-check_mysql_replication.spec
diff -u packages/nagios-plugin-check_mysql_replication/nagios-plugin-check_mysql_replication.spec:1.11 packages/nagios-plugin-check_mysql_replication/nagios-plugin-check_mysql_replication.spec:1.12
--- packages/nagios-plugin-check_mysql_replication/nagios-plugin-check_mysql_replication.spec:1.11	Wed May 16 14:56:14 2007
+++ packages/nagios-plugin-check_mysql_replication/nagios-plugin-check_mysql_replication.spec	Tue Sep  8 11:22:16 2009
@@ -1,14 +1,16 @@
 # $Revision$, $Date$
+%define		plugin	check_mysql_replication
 %include	/usr/lib/rpm/macros.perl
 Summary:	Nagios plugin to check replication between MySQL database instances
 Summary(pl.UTF-8):	Wtyczka Nagiosa do sprawdzania replikacji między instancjami bazy danych MySQL
-Name:		nagios-plugin-check_mysql_replication
+Name:		nagios-plugin-%{plugin}
 Version:	0.03
-Release:	3
+Release:	4
 License:	Opensource
 Group:		Networking
 Source0:	http://www.james.rcpt.to/svn/trunk/nagios/check_mysql_replication/check_mysql_replication.pl
 # Source0-md5:	af8da7807e1a03bf301fa70658fb08c3
+Source1:	%{plugin}.cfg
 Patch0:		%{name}-defaultpass.patch
 URL:		http://www.james.rcpt.to/svn/trunk/nagios/check_mysql_replication/
 BuildRequires:	rpm-perlprov >= 4.1-13
@@ -18,8 +20,8 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_plugindir	%{_prefix}/lib/nagios/plugins
 %define		_sysconfdir	/etc/nagios/plugins
+%define		plugindir	%{_prefix}/lib/nagios/plugins
 
 %description
 Check if a MySQL slave is running (IO thread), plus check the master
@@ -32,31 +34,22 @@
 
 %prep
 %setup -q -c -T
-install %{SOURCE0} check_mysql_replication.pl
+cp -a %{SOURCE0} %{plugin}
 %patch0 -p1
-cat > nagios.cfg <<'EOF'
-# Usage:
-# check_mysql_replication!$HOSTADDRESS$!3309
-# and define $USER3$ + $USER4$ for mysql passwords
-define command {
-	command_name    check_mysql_replication
-	command_line    %{_plugindir}/check_mysql_replication --slave $ARG1$ --slave-port $ARG2$ --slave-user $USER3$ --slave-pass $USER4$ --master-user $USER3$ --master-pass $USER4$
-}
-EOF
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_plugindir}}
-install check_mysql_replication.pl $RPM_BUILD_ROOT%{_plugindir}/check_mysql_replication
-cp -a nagios.cfg $RPM_BUILD_ROOT%{_sysconfdir}/check_mysql_replication.cfg
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{plugindir}}
+install -p %{plugin} $RPM_BUILD_ROOT%{plugindir}
+sed -e 's, at plugindir@,%{plugindir},' %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/check_mysql_replication.cfg
-%attr(755,root,root) %{_plugindir}/check_mysql_replication
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{plugin}.cfg
+%attr(755,root,root) %{plugindir}/%{plugin}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -64,6 +57,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2009/09/08 09:22:16  glen
+- add more generic config; rel 4
+
 Revision 1.11  2007/05/16 12:56:14  glen
 - noarch; rel 3
 

================================================================
Index: packages/nagios-plugin-check_mysql_replication/check_mysql_replication.cfg
diff -u /dev/null packages/nagios-plugin-check_mysql_replication/check_mysql_replication.cfg:1.1
--- /dev/null	Tue Sep  8 11:22:21 2009
+++ packages/nagios-plugin-check_mysql_replication/check_mysql_replication.cfg	Tue Sep  8 11:22:16 2009
@@ -0,0 +1,25 @@
+# Useful arguments:
+#  --master <host>       - MySQL instance running as server (override)
+#  --master-port <d>     - port for the master (override)
+#  --master-user <user>  - Username for master (override)
+#  --master-pass <pass>  - Password for master
+#  --slave <host>        - MySQL instance running as a slave server
+#  --slave-port <d>      - port for the slave
+#  --slave-user <user>   - Username with File/Process/Super privs
+#  --slave-pass <pass>   - Password for above user
+#  --crit <positions>    - Number of complete master binlogs for critical state
+#  --warn <positions>    - Number of complete master binlog for warning state
+
+define command {
+	command_name    check_mysql_replication
+	command_line    @plugindir@/check_mysql_replication $ARG1$
+}
+
+define service {
+	use                     generic-service
+	name                    mysql_replication
+	service_description     mysql_replication
+	register                0
+
+	check_command           check_mysql_replication
+}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_mysql_replication/nagios-plugin-check_mysql_replication-defaultpass.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_mysql_replication/nagios-plugin-check_mysql_replication.spec?r1=1.11&r2=1.12&f=u



More information about the pld-cvs-commit mailing list