packages: nagios-plugin-check_mysql_health/nagios-plugin-check_mysql_health...

glen glen at pld-linux.org
Mon Apr 5 21:32:34 CEST 2010


Author: glen                         Date: Mon Apr  5 19:32:34 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move config to separate file
- noarch and fool autoconf
- depend on nagios-common not nagios-core
- rel 2

---- Files affected:
packages/nagios-plugin-check_mysql_health:
   nagios-plugin-check_mysql_health.spec (1.4 -> 1.5) , check_mysql_health.cfg (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_mysql_health/nagios-plugin-check_mysql_health.spec
diff -u packages/nagios-plugin-check_mysql_health/nagios-plugin-check_mysql_health.spec:1.4 packages/nagios-plugin-check_mysql_health/nagios-plugin-check_mysql_health.spec:1.5
--- packages/nagios-plugin-check_mysql_health/nagios-plugin-check_mysql_health.spec:1.4	Fri Nov  6 09:11:31 2009
+++ packages/nagios-plugin-check_mysql_health/nagios-plugin-check_mysql_health.spec	Mon Apr  5 21:32:29 2010
@@ -5,16 +5,18 @@
 Summary(pl.UTF-8):	Wtyczka Nagiosa monitorująca parametry wydajnościowe bazy danych MySQL
 Name:		nagios-plugin-%{plugin}
 Version:	2.1
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Networking
 Source0:	http://labs.consol.de/wp-content/uploads/2009/10/%{plugin}-%{version}.tar.gz
 # Source0-md5:	4178162990dda0fc0ee9a854b1f26d12
+Source1:	%{plugin}.cfg
 URL:		http://labs.consol.de/lang/de/nagios/check_mysql_health/
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	sed >= 4.0
-Requires:	nagios-core
+Requires:	nagios-common
 Obsoletes:	nagios-plugin-check_mysql_perf
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/nagios/plugins
@@ -31,96 +33,14 @@
 %prep
 %setup -q -n %{plugin}-%{version}
 
-# see plugin --help (-m option) for list of these
-cat > nagios.cfg <<'EOF'
-define command {
-	command_name    %{plugin}_uptime
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m uptime
-}
-define command {
-	command_name    %{plugin}_tmp_disk_tables
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m tmp-disk-tables
-}
-define command {
-	command_name    %{plugin}_index_usage
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m index-usage
-}
-define command {
-	command_name    %{plugin}_long_running_procs
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m long-running-procs
-}
-define command {
-	command_name    %{plugin}_slave_lag
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m slave-lag
-}
-define command {
-	command_name    %{plugin}_slave_io_running
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m slave-io-running
-}
-define command {
-	command_name    %{plugin}_slave_sql_running
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m slave-sql-running
-}
-define command {
-	command_name    %{plugin}_threads_connected
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m threads-connected
-}
-define command {
-	command_name    %{plugin}_threadcache_hitrate
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m threadcache-hitrate
-}
-define command {
-	command_name    %{plugin}_querycache_hitrate
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m querycache-hitrate
-}
-define command {
-	command_name    %{plugin}_keycache_hitrate
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m keycache-hitrate
-}
-define command {
-	command_name    %{plugin}_bufferpool_hitrate
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m bufferpool-hitrate
-}
-define command {
-	command_name    %{plugin}_tablecache_hitrate
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m tablecache-hitrate
-}
-define command {
-	command_name    %{plugin}_table_lock_contention
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m table-lock-contention
-}
-define command {
-	command_name    %{plugin}_temp_disk_tables
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m temp-disk-tables
-}
-define command {
-	command_name    %{plugin}_connection_time
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m connection-time
-}
-define command {
-	command_name    %{plugin}_slow_queries
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m slow-queries
-}
-define command {
-	command_name    %{plugin}_qcache_lowmem_prunes
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m qcache-lowmem-prunes
-}
-define command {
-	command_name    %{plugin}_bufferpool_wait_free
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m bufferpool-wait-free
-}
-define command {
-	command_name    %{plugin}_log_waits
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m log-waits
-}
-EOF
-
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
 %configure \
+	--host=%{_target} \
+	--build=%{_target} \
 	--libdir=%{plugindir} \
 	--libexecdir=%{plugindir} \
 	--with-nagios-user=nagios \
@@ -135,14 +55,14 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-cp -a nagios.cfg $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
+cp -a %{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}/%{plugin}.cfg
+%attr(640,root,nagios) %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"`)
@@ -151,6 +71,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/04/05 19:32:29  glen
+- move config to separate file
+- noarch and fool autoconf
+- depend on nagios-common not nagios-core
+- rel 2
+
 Revision 1.4  2009/11/06 08:11:31  arekm
 - up to 2.1
 
@@ -158,9 +84,7 @@
 - BR perl stuff
 
 Revision 1.2  2009/04/02 08:45:01  arekm
-O: nagios-plugin-check_mysql_perf
+- O: nagios-plugin-check_mysql_perf
 
 Revision 1.1  2009/04/02 08:44:36  arekm
 - new, obsoletes mysql_perf.
-
-

================================================================
Index: packages/nagios-plugin-check_mysql_health/check_mysql_health.cfg
diff -u /dev/null packages/nagios-plugin-check_mysql_health/check_mysql_health.cfg:1.1
--- /dev/null	Mon Apr  5 21:32:34 2010
+++ packages/nagios-plugin-check_mysql_health/check_mysql_health.cfg	Mon Apr  5 21:32:29 2010
@@ -0,0 +1,80 @@
+define command {
+	command_name    check_mysql_health_uptime
+	command_line    /usr/lib/nagios/plugins/check_mysql_health -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m uptime
+}
+define command {
+	command_name    check_mysql_health_tmp_disk_tables
+	command_line    /usr/lib/nagios/plugins/check_mysql_health -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m tmp-disk-tables
+}
+define command {
+	command_name    check_mysql_health_index_usage
+	command_line    /usr/lib/nagios/plugins/check_mysql_health -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m index-usage
+}
+define command {
+	command_name    check_mysql_health_long_running_procs
+	command_line    /usr/lib/nagios/plugins/check_mysql_health -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m long-running-procs
+}
+define command {
+	command_name    check_mysql_health_slave_lag
+	command_line    /usr/lib/nagios/plugins/check_mysql_health -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m slave-lag
+}
+define command {
+	command_name    check_mysql_health_slave_io_running
+	command_line    /usr/lib/nagios/plugins/check_mysql_health -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m slave-io-running
+}
+define command {
+	command_name    check_mysql_health_slave_sql_running
+	command_line    /usr/lib/nagios/plugins/check_mysql_health -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m slave-sql-running
+}
+define command {
+	command_name    check_mysql_health_threads_connected
+	command_line    /usr/lib/nagios/plugins/check_mysql_health -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m threads-connected
+}
+define command {
+	command_name    check_mysql_health_threadcache_hitrate
+	command_line    /usr/lib/nagios/plugins/check_mysql_health -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m threadcache-hitrate
+}
+define command {
+	command_name    check_mysql_health_querycache_hitrate
+	command_line    /usr/lib/nagios/plugins/check_mysql_health -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m querycache-hitrate
+}
+define command {
+	command_name    check_mysql_health_keycache_hitrate
+	command_line    /usr/lib/nagios/plugins/check_mysql_health -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m keycache-hitrate
+}
+define command {
+	command_name    check_mysql_health_bufferpool_hitrate
+	command_line    /usr/lib/nagios/plugins/check_mysql_health -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m bufferpool-hitrate
+}
+define command {
+	command_name    check_mysql_health_tablecache_hitrate
+	command_line    /usr/lib/nagios/plugins/check_mysql_health -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m tablecache-hitrate
+}
+define command {
+	command_name    check_mysql_health_table_lock_contention
+	command_line    /usr/lib/nagios/plugins/check_mysql_health -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m table-lock-contention
+}
+define command {
+	command_name    check_mysql_health_temp_disk_tables
+	command_line    /usr/lib/nagios/plugins/check_mysql_health -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m temp-disk-tables
+}
+define command {
+	command_name    check_mysql_health_connection_time
+	command_line    /usr/lib/nagios/plugins/check_mysql_health -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m connection-time
+}
+define command {
+	command_name    check_mysql_health_slow_queries
+	command_line    /usr/lib/nagios/plugins/check_mysql_health -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m slow-queries
+}
+define command {
+	command_name    check_mysql_health_qcache_lowmem_prunes
+	command_line    /usr/lib/nagios/plugins/check_mysql_health -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m qcache-lowmem-prunes
+}
+define command {
+	command_name    check_mysql_health_bufferpool_wait_free
+	command_line    /usr/lib/nagios/plugins/check_mysql_health -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m bufferpool-wait-free
+}
+define command {
+	command_name    check_mysql_health_log_waits
+	command_line    /usr/lib/nagios/plugins/check_mysql_health -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$ -m log-waits
+}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_mysql_health/nagios-plugin-check_mysql_health.spec?r1=1.4&r2=1.5&f=u



More information about the pld-cvs-commit mailing list