packages: nagios-plugin-check_memcached/nagios-plugin-check_memcached.spec, ...

[glen]

Author: glen                         Date: Tue Sep  8 11:18:14 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update service template; rel 4

---- Files affected:
packages/nagios-plugin-check_memcached:
   nagios-plugin-check_memcached.spec (1.9 -> 1.10) , check_memcached.cfg (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_memcached/nagios-plugin-check_memcached.spec
diff -u packages/nagios-plugin-check_memcached/nagios-plugin-check_memcached.spec:1.9 packages/nagios-plugin-check_memcached/nagios-plugin-check_memcached.spec:1.10
--- packages/nagios-plugin-check_memcached/nagios-plugin-check_memcached.spec:1.9	Thu Feb 19 20:09:21 2009
+++ packages/nagios-plugin-check_memcached/nagios-plugin-check_memcached.spec	Tue Sep  8 13:18:08 2009
@@ -9,13 +9,14 @@
 Summary:	Nagios plugin to observe memcached
 Name:		nagios-plugin-%{plugin}
 Version:	0.02
-Release:	3
+Release:	4
 Epoch:		1
 # same as perl
 License:	GPL v1+ or Artistic
 Group:		Networking
 Source0:	http://www.cpan.org/modules/by-module/Nagios/Nagios-Plugins-Memcached-%{version}.tar.gz
 # Source0-md5:	99154aa60b099a2563f8773f95fd0646
+Source1:	%{plugin}.cfg
 Patch0:		%{name}.patch
 URL:		http://search.cpan.org/dist/Nagios-Plugins-Memcached/
 BuildRequires:	perl-Nagios-Plugin
@@ -40,44 +41,6 @@
 %patch0 -p1
 mv lib/Nagios/Plugin{s,}
 
-cat > nagios.cfg <<'EOF'
-# NOTE: This plugin can execute with all threshold options together.
-
-### check response time(msec) for memcached
-define command {
-	command_name    %{plugin}_response
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ -w 3 -c 5
-}
-
-### check cache size ratio(bytes/limit_maxbytes[%]) for memcached
-define command {
-	command_name    %{plugin}_size
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ --size-warning 60 --size-critical 80
-}
-
-### check cache hit ratio(get_hits/cmd_get[%]) for memcached
-define command {
-	command_name    %{plugin}_hit
-	command_line    %{plugindir}/%{plugin} -H $HOSTADDRESS$ --hit-warning 40 --size-critical 20
-}
-
-## generic memcached service, you need to define check_command from one of the above
-define service {
-	register                0
-	use                     generic-service
-	name                    memcached
-
-	check_period            24x7
-	normal_check_interval   5
-	retry_check_interval    2
-	max_check_attempts      3
-
-	notification_interval   15
-	notification_period     24x7
-	notification_options    w,u,c,r
-}
-EOF
-
 %build
 %{__perl} Makefile.PL \
 	--skipdeps \
@@ -94,7 +57,7 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{plugindir}}
-cp -a nagios.cfg $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
 
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Nagios/Plugins/Memcached/.packlist
 
@@ -114,6 +77,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2009/09/08 11:18:08  glen
+- update service template; rel 4
+
 Revision 1.9  2009/02/19 19:09:21  glen
 - add "memcached" service template to plugin config; rel 3
 

================================================================
Index: packages/nagios-plugin-check_memcached/check_memcached.cfg
diff -u /dev/null packages/nagios-plugin-check_memcached/check_memcached.cfg:1.1
--- /dev/null	Tue Sep  8 13:18:14 2009
+++ packages/nagios-plugin-check_memcached/check_memcached.cfg	Tue Sep  8 13:18:08 2009
@@ -0,0 +1,26 @@
+# NOTE: This plugin can execute with all threshold options together.
+
+### check response time(msec) for memcached
+define command {
+	command_name    check_memcached_response
+	command_line    @plugindir at check_memcached -H $HOSTADDRESS$ -w 3 -c 5
+}
+
+### check cache size ratio(bytes/limit_maxbytes[%]) for memcached
+define command {
+	command_name    check_memcached_size
+	command_line    @plugindir at check_memcached -H $HOSTADDRESS$ --size-warning 60 --size-critical 80
+}
+
+### check cache hit ratio(get_hits/cmd_get[%]) for memcached
+define command {
+	command_name    check_memcached_hit
+	command_line    @plugindir at check_memcached -H $HOSTADDRESS$ --hit-warning 40 --size-critical 20
+}
+
+## generic memcached service, you need to define check_command from one of the above
+define service {
+	use				generic-service
+	name			memcached
+	register		0
+}
================================================================

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