[Pkg-nagios-changes] nagios-plugins/debian changelog, 1.17, 1.18 control, 1.2, 1.3 rules, 1.5, 1.6

Tue Oct 18 08:46:16 UTC 2005

Update of /cvsroot/pkg-nagios/nagios-plugins/debian
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv31055/debian

Modified Files:
	changelog control rules 
Log Message:
first attempt at nagios-plugins package split

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios-plugins/debian/changelog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18

--- changelog	11 Oct 2005 15:16:34 -0000	1.17
+++ changelog	18 Oct 2005 08:46:12 -0000	1.18
@@ -1,3 +1,23 @@
+nagios-plugins (1.4.2-4) UNRELEASED; urgency=low
+
+  * Sean Finney:
+    - only depend on ntp, not ntp | ntp-simple.  hopefully this should
+      allow nagios-plugins to co-exist with openntpd et al.
+    - now building against libmysqlclient14-dev.
+    - updated Standards-Version to 3.6.2
+    - nagios-plugins is now separated into 3 separate packages:
+      nagios-plugins, nagios-plugins-basic, and nagios-plugins-standard.
+      this should provide folks with a "basic" set of plugins as an
+      alternative to those who don't want to bring in so many dependencies
+      (specifically, users of nsca and nagios-nrpe-server).  the original
+      package will depend on both of the new packages, for backwards
+      compatibility.  the list of what-goes-where may change in future
+      updates, but nagios-plugins will always bring in everything.
+      contact me if you have specific preferences on how the layout should
+      be done (closes: #303996, #264194, #255438).
+
+ -- sean finney <seanius at debian.org>  Tue, 18 Oct 2005 10:44:53 +0200
+
 nagios-plugins (1.4.2-3) unstable; urgency=low
 
   * Sean Finney:

Index: control
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios-plugins/debian/control,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- control	3 Oct 2005 07:40:32 -0000	1.2
+++ control	18 Oct 2005 08:46:12 -0000	1.3
@@ -3,27 +3,74 @@
 Priority: extra
 Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
 Uploaders: Sean Finney <seanius at debian.org>, Guido Trotter <ultrotter at debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch (>= 2.0.9), libldap2-dev, postgresql-dev, libmysqlclient12-dev | libmysqlclient-dev, libsnmp9-dev, libradius1-dev, libkrb5-dev, libnet-snmp-perl, procps, coreutils | fileutils, iputils-ping, dnsutils, bind9-host | host, snmp, mawk | awk
-Standards-Version: 3.6.1.0
+Build-Depends: debhelper (>= 4.0.0), dpatch (>= 2.0.9), libldap2-dev, postgresql-dev, libmysqlclient14-dev | libmysqlclient-dev, libsnmp9-dev | libsnmp-dev, libradius1-dev, libkrb5-dev, libnet-snmp-perl, procps, coreutils | fileutils, iputils-ping, dnsutils, bind9-host | host, snmp, mawk | awk
+Standards-Version: 3.6.2
 
 Package: nagios-plugins
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, fping, qstat, snmp, radiusclient1, libnet-snmp-perl, procps, iputils-ping, dnsutils, bind9-host | host, ntpdate, ntp-simple | ntp, smbclient
-Conflicts: netsaint, netsaint-plugins, netsaint-plugins-extra, netsaint-plugins-fping, netsaint-plugins-game, netsaint-plugins-ldap, netsaint-plugins-mysql, netsaint-plugins-pgsql, netsaint-plugins-radius, netsaint-plugins-samba, netsaint-plugins-snmp, nagios-text (<= 2:1.2-3.1), nagios-mysql (<= 2:1.2-3.1), nagios-pgsql (<= 2:1.2-3.1)
-Suggests: ntp
-Recommends: nagios-text | nagios
+Depends: nagios-plugins-basic, nagios-plugins-standard
+Suggests: nagios-text | nagios
 Description: Plugins for the nagios network monitoring and management system
  Nagios is a host/service/network monitoring and management system. It has
  the following features:
  .
-  o  Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP,
+  *  Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP,
      PING, etc.)
-  o  Plugin interface to allow for user-developed service checks
-  o  Contact notifications when problems occur and get resolved (via email,
+  *  Plugin interface to allow for user-developed service checks
+  *  Contact notifications when problems occur and get resolved (via email,
      pager, or user-defined method)
-  o  Ability to define event handlers to be run during service or host events
+  *  Ability to define event handlers to be run during service or host events
      (for proactive problem resolution)
-  o  Web output (current status, notifications, history, log file, etc.)
+  *  Web output (current status, notifications, history, log file, etc.)
  .
- These plugins are used by nagios to perform the various service checks.
+ This meta-package will install the entire suite of plugins for nagios.
+ If you are installing nagios plugins on a remote "satellite" server
+ (using nagios-nrpe-server or nsca), you may be interested in the
+ nagios-plugins-basic package.
 
+Package: nagios-plugins-basic
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, procps
+Conflicts: nagios-plugins (<= 1.4.2-2)
+Replaces: nagios-plugins
+Suggests: nagios-text | nagios
+Description: Plugins for the nagios network monitoring and management system
+ Nagios is a host/service/network monitoring and management system. It has
+ the following features:
+ .
+  *  Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP,
+     PING, etc.)
+  *  Plugin interface to allow for user-developed service checks
+  *  Contact notifications when problems occur and get resolved (via email,
+     pager, or user-defined method)
+  *  Ability to define event handlers to be run during service or host events
+     (for proactive problem resolution)
+  *  Web output (current status, notifications, history, log file, etc.)
+ .
+ This package provides a basic set of plugins with minimal external
+ dependencies.  It is not likely to be useful by itself unless you are
+ installing a remote "satellite" server (using nagios-nrpe-server or nsca,
+ for example).
+
+Package: nagios-plugins-standard
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, procps
+Conflicts: nagios-plugins (<= 1.4.2-2)
+Replaces: nagios-plugins
+Depends: ${shlibs:Depends}, ${misc:Depends}, fping, qstat, snmp, radiusclient1, libnet-snmp-perl, iputils-ping, dnsutils, bind9-host | host, ntpdate, ntp, smbclient
+Suggests: nagios-text | nagios
+Description: Plugins for the nagios network monitoring and management system
+ Nagios is a host/service/network monitoring and management system. It has
+ the following features:
+ .
+  *  Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP,
+     PING, etc.)
+  *  Plugin interface to allow for user-developed service checks
+  *  Contact notifications when problems occur and get resolved (via email,
+     pager, or user-defined method)
+  *  Ability to define event handlers to be run during service or host events
+     (for proactive problem resolution)
+  *  Web output (current status, notifications, history, log file, etc.)
+ .
+ This package provides the suite of plugins that are most likely to be
+ useful on a central nagios host.

Index: rules
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios-plugins/debian/rules,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rules	12 Oct 2005 21:05:28 -0000	1.5
+++ rules	18 Oct 2005 08:46:12 -0000	1.6
@@ -17,6 +17,17 @@
 
 CFLAGS = -Wall -g
 
+NP_LIBEXEC:=/usr/lib/nagios/plugins
+NP_ETC:=/etc/nagios-plugins/config
+NP_BASIC_DIR:=$(CURDIR)/debian/nagios-plugins-basic
+NP_STD_DIR:=$(CURDIR)/debian/nagios-plugins-standard
+std_plugins:=check_breeze check_ifoperstatus check_hpjd check_ifstatus \
+	check_rpc check_snmp check_wave check_fping check_game \
+	check_radius check_mysql check_pgsql
+std_plugin_cfgs:=breeze dns flexlm games hppjd ifstatus ldap mrtg mysql \
+	netware nt ntp pgsql ping radius snmp
+
+
 PATH = /bin:/sbin:/usr/bin:/usr/sbin
 
 
@@ -33,7 +44,7 @@
 	export PATH=$(PATH)
 	dh_testdir
 	# Add here commands to configure the package.
-	EXTRAS="check_game check_fping check_by_ssh" CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --libexecdir=/usr/lib/nagios/plugins --with-nagios-user=nagios --with-nagios-group=nagios --with-trusted-path=/bin:/sbin:/usr/bin:/usr/sbin --with-df-command="/bin/df -Pk"
+	EXTRAS="check_game check_fping check_by_ssh" CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --libexecdir=${NP_LIBEXEC} --with-nagios-user=nagios --with-nagios-group=nagios --with-trusted-path=/bin:/sbin:/usr/bin:/usr/sbin --with-df-command="/bin/df -Pk"
 	# workaround autotools trying to be helpful if timestamps change (cvs?)
 	find . -name 'Makefile.in' -print0 | xargs -0 touch -r configure
 	touch *m4 -r configure
@@ -68,7 +79,15 @@
 
 	# Add here commands to install the package into debian/nagios-plugins.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/nagios-plugins
-	cp $(CURDIR)/debian/pluginconfig/*.cfg $(CURDIR)/debian/nagios-plugins/etc/nagios-plugins/config/
+	cp $(CURDIR)/debian/pluginconfig/*.cfg ${NP_BASIC_DIR}/${NP_ETC}
+	# split up basic vs. standard plugins
+	for p in ${std_plugins}; do \
+		mv ${NP_BASIC_DIR}/${NP_LIBEXEC}/$$p ${NP_STD_DIR}/${NP_LIBEXEC}; \
+	done
+	# now do the same for their configs
+	for c in ${std_plugin_cfgs}; do \
+		mv ${NP_BASIC_DIR}/${NP_ETC}/$${c}.cfg ${NP_STD_DIR}/${NP_ETC}; \
+	done
 	# XXX upstream breakage
 	ln -s check_ldap $(CURDIR)/debian/nagios-plugins/usr/lib/nagios/plugins/check_ldaps
 


