Decouple nagios-plugins from icinga

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/icinga b/config/rootfiles/packages/icinga
index 7a8ae9224c9dd6197e43fa16b0f1e71b31491870..0838baae1a1b484c0942d9e5fd38ddf1f6255f72 100644 (file)
--- a/config/rootfiles/packages/icinga
+++ b/config/rootfiles/packages/icinga
@@ -24,85 +24,6 @@ usr/bin/icinga
 usr/bin/icingastats
 #usr/lib/icinga
 usr/lib/icinga/p1.pl
-#usr/lib/icinga/plugins
-usr/lib/icinga/plugins/check_apt
-usr/lib/icinga/plugins/check_breeze
-usr/lib/icinga/plugins/check_by_ssh
-usr/lib/icinga/plugins/check_clamd
-usr/lib/icinga/plugins/check_cluster
-usr/lib/icinga/plugins/check_dhcp
-usr/lib/icinga/plugins/check_dig
-usr/lib/icinga/plugins/check_disk
-usr/lib/icinga/plugins/check_disk_smb
-usr/lib/icinga/plugins/check_dns
-usr/lib/icinga/plugins/check_dummy
-usr/lib/icinga/plugins/check_file_age
-usr/lib/icinga/plugins/check_flexlm
-usr/lib/icinga/plugins/check_ftp
-usr/lib/icinga/plugins/check_hpjd
-usr/lib/icinga/plugins/check_http
-usr/lib/icinga/plugins/check_icmp
-usr/lib/icinga/plugins/check_ide_smart
-usr/lib/icinga/plugins/check_ifoperstatus
-usr/lib/icinga/plugins/check_ifstatus
-usr/lib/icinga/plugins/check_imap
-usr/lib/icinga/plugins/check_ircd
-usr/lib/icinga/plugins/check_jabber
-usr/lib/icinga/plugins/check_ldap
-usr/lib/icinga/plugins/check_ldaps
-usr/lib/icinga/plugins/check_load
-usr/lib/icinga/plugins/check_log
-usr/lib/icinga/plugins/check_mailq
-usr/lib/icinga/plugins/check_mrtg
-usr/lib/icinga/plugins/check_mrtgtraf
-usr/lib/icinga/plugins/check_mysql
-usr/lib/icinga/plugins/check_mysql_query
-usr/lib/icinga/plugins/check_nagios
-usr/lib/icinga/plugins/check_nntp
-usr/lib/icinga/plugins/check_nntps
-usr/lib/icinga/plugins/check_nt
-usr/lib/icinga/plugins/check_ntp
-usr/lib/icinga/plugins/check_ntp_peer
-usr/lib/icinga/plugins/check_ntp_time
-usr/lib/icinga/plugins/check_nwstat
-usr/lib/icinga/plugins/check_oracle
-usr/lib/icinga/plugins/check_overcr
-usr/lib/icinga/plugins/check_ping
-usr/lib/icinga/plugins/check_pop
-usr/lib/icinga/plugins/check_procs
-usr/lib/icinga/plugins/check_real
-usr/lib/icinga/plugins/check_rpc
-usr/lib/icinga/plugins/check_sensors
-usr/lib/icinga/plugins/check_simap
-usr/lib/icinga/plugins/check_smtp
-usr/lib/icinga/plugins/check_snmp
-usr/lib/icinga/plugins/check_spop
-usr/lib/icinga/plugins/check_ssh
-usr/lib/icinga/plugins/check_ssmtp
-usr/lib/icinga/plugins/check_swap
-usr/lib/icinga/plugins/check_tcp
-usr/lib/icinga/plugins/check_time
-usr/lib/icinga/plugins/check_udp
-usr/lib/icinga/plugins/check_ups
-usr/lib/icinga/plugins/check_uptime
-usr/lib/icinga/plugins/check_users
-usr/lib/icinga/plugins/check_wave
-usr/lib/icinga/plugins/eventhandlers
-usr/lib/icinga/plugins/eventhandlers/disable_active_service_checks
-usr/lib/icinga/plugins/eventhandlers/disable_notifications
-usr/lib/icinga/plugins/eventhandlers/distributed-monitoring
-usr/lib/icinga/plugins/eventhandlers/distributed-monitoring/obsessive_svc_handler
-usr/lib/icinga/plugins/eventhandlers/distributed-monitoring/submit_check_result_via_nsca
-usr/lib/icinga/plugins/eventhandlers/enable_active_service_checks
-usr/lib/icinga/plugins/eventhandlers/enable_notifications
-usr/lib/icinga/plugins/eventhandlers/redundancy-scenario1
-usr/lib/icinga/plugins/eventhandlers/redundancy-scenario1/handle-master-host-event
-usr/lib/icinga/plugins/eventhandlers/redundancy-scenario1/handle-master-proc-event
-usr/lib/icinga/plugins/eventhandlers/submit_check_result
-usr/lib/icinga/plugins/negate
-usr/lib/icinga/plugins/urlize
-usr/lib/icinga/plugins/utils.pm
-usr/lib/icinga/plugins/utils.sh
 usr/share/icinga
 usr/share/icinga/cgi-bin
 usr/share/icinga/cgi-bin/avail.cgi

diff --git a/config/rootfiles/packages/nagios-plugins b/config/rootfiles/packages/nagios-plugins
new file mode 100644 (file)
index 0000000..bb73650
--- /dev/null
+++ b/config/rootfiles/packages/nagios-plugins
@@ -0,0 +1,79 @@
+usr/lib/nagios/plugins
+usr/lib/nagios/plugins/check_apt
+usr/lib/nagios/plugins/check_breeze
+usr/lib/nagios/plugins/check_by_ssh
+usr/lib/nagios/plugins/check_clamd
+usr/lib/nagios/plugins/check_cluster
+usr/lib/nagios/plugins/check_dhcp
+usr/lib/nagios/plugins/check_dig
+usr/lib/nagios/plugins/check_disk
+usr/lib/nagios/plugins/check_disk_smb
+usr/lib/nagios/plugins/check_dns
+usr/lib/nagios/plugins/check_dummy
+usr/lib/nagios/plugins/check_file_age
+usr/lib/nagios/plugins/check_flexlm
+usr/lib/nagios/plugins/check_ftp
+usr/lib/nagios/plugins/check_hpjd
+usr/lib/nagios/plugins/check_http
+usr/lib/nagios/plugins/check_icmp
+usr/lib/nagios/plugins/check_ide_smart
+usr/lib/nagios/plugins/check_ifoperstatus
+usr/lib/nagios/plugins/check_ifstatus
+usr/lib/nagios/plugins/check_imap
+usr/lib/nagios/plugins/check_ircd
+usr/lib/nagios/plugins/check_jabber
+usr/lib/nagios/plugins/check_ldap
+usr/lib/nagios/plugins/check_ldaps
+usr/lib/nagios/plugins/check_load
+usr/lib/nagios/plugins/check_log
+usr/lib/nagios/plugins/check_mailq
+usr/lib/nagios/plugins/check_mrtg
+usr/lib/nagios/plugins/check_mrtgtraf
+usr/lib/nagios/plugins/check_mysql
+usr/lib/nagios/plugins/check_mysql_query
+usr/lib/nagios/plugins/check_nagios
+usr/lib/nagios/plugins/check_nntp
+usr/lib/nagios/plugins/check_nntps
+usr/lib/nagios/plugins/check_nt
+usr/lib/nagios/plugins/check_ntp
+usr/lib/nagios/plugins/check_ntp_peer
+usr/lib/nagios/plugins/check_ntp_time
+usr/lib/nagios/plugins/check_nwstat
+usr/lib/nagios/plugins/check_oracle
+usr/lib/nagios/plugins/check_overcr
+usr/lib/nagios/plugins/check_ping
+usr/lib/nagios/plugins/check_pop
+usr/lib/nagios/plugins/check_procs
+usr/lib/nagios/plugins/check_real
+usr/lib/nagios/plugins/check_rpc
+usr/lib/nagios/plugins/check_sensors
+usr/lib/nagios/plugins/check_simap
+usr/lib/nagios/plugins/check_smtp
+usr/lib/nagios/plugins/check_snmp
+usr/lib/nagios/plugins/check_spop
+usr/lib/nagios/plugins/check_ssh
+usr/lib/nagios/plugins/check_ssmtp
+usr/lib/nagios/plugins/check_swap
+usr/lib/nagios/plugins/check_tcp
+usr/lib/nagios/plugins/check_time
+usr/lib/nagios/plugins/check_udp
+usr/lib/nagios/plugins/check_ups
+usr/lib/nagios/plugins/check_uptime
+usr/lib/nagios/plugins/check_users
+usr/lib/nagios/plugins/check_wave
+usr/lib/nagios/plugins/eventhandlers
+usr/lib/nagios/plugins/eventhandlers/disable_active_service_checks
+usr/lib/nagios/plugins/eventhandlers/disable_notifications
+usr/lib/nagios/plugins/eventhandlers/distributed-monitoring
+usr/lib/nagios/plugins/eventhandlers/distributed-monitoring/obsessive_svc_handler
+usr/lib/nagios/plugins/eventhandlers/distributed-monitoring/submit_check_result_via_nsca
+usr/lib/nagios/plugins/eventhandlers/enable_active_service_checks
+usr/lib/nagios/plugins/eventhandlers/enable_notifications
+usr/lib/nagios/plugins/eventhandlers/redundancy-scenario1
+usr/lib/nagios/plugins/eventhandlers/redundancy-scenario1/handle-master-host-event
+usr/lib/nagios/plugins/eventhandlers/redundancy-scenario1/handle-master-proc-event
+usr/lib/nagios/plugins/eventhandlers/submit_check_result
+usr/lib/nagios/plugins/negate
+usr/lib/nagios/plugins/urlize
+usr/lib/nagios/plugins/utils.pm
+usr/lib/nagios/plugins/utils.sh

diff --git a/lfs/icinga b/lfs/icinga
index 5d8d5a16f647127802997b5120a5313818d3aea6..43fc22b2480a082c4d82d75e7f73442c653ebc24 100644 (file)
--- a/lfs/icinga
+++ b/lfs/icinga
@@ -25,7 +25,6 @@
 include Config
 
 VER        = 1.11.4
-PLUGIN_VER = 2.0.2
 
 THISAPP    = icinga-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -33,24 +32,19 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = icinga
-PAK_VER    = 2
+PAK_VER    = 3
 
-DEPS       = ""
-
-CFLAGS    += -fno-strict-aliasing
+DEPS       = "nagios-plugins"
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) nagios-plugins-$(PLUGIN_VER).tar.gz
+objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-nagios-plugins-$(PLUGIN_VER).tar.gz = \
-       $(DL_FROM)/nagios-plugins-$(PLUGIN_VER).tar.gz
 
 $(DL_FILE)_MD5 = cfe64b91ec84f5431e53959e31ff07b5
-nagios-plugins-$(PLUGIN_VER).tar.gz_MD5 = 2f6d9c43adcf9f024175e48a44d099d4
 
 install : $(TARGET)
 
@@ -83,10 +77,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       @rm -rf $(DIR_SRC)/nagios-plugins-$(PLUGIN_VER) && cd $(DIR_SRC) && \
-               tar axf $(DIR_DL)/nagios-plugins-$(PLUGIN_VER).tar.gz
-
-       # Compile core
        cd $(DIR_APP) && \
                ./configure \
                        --prefix=/usr \
@@ -96,7 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                        --sbindir=/usr/share/icinga/cgi-bin \
                        --localstatedir=/var/icinga \
                        --libdir=/usr/lib/icinga \
-                       --libexecdir=/usr/lib/icinga/plugins \
+                       --libexecdir=/usr/lib/nagios/plugins \
                        --with-lockfile=/var/run/icinga.pid \
                        --with-httpd-conf=/etc/httpd/conf/conf.d \
                        --with-icinga-user=nobody \
@@ -105,18 +95,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                        --enable-embedded-perl \
                        --disable-idoutils
        cd $(DIR_APP) && make all $(MAKETUNING)
-
-       # Compile plugins
-       cd $(DIR_SRC)/nagios-plugins-$(PLUGIN_VER) && \
-               ./configure \
-                       --prefix=/usr \
-                       --libexecdir=/usr/lib/icinga/plugins \
-                       --with-nagios-user=nobody \
-                       --with-nagios-group=nobody \
-                       --without-ipv6
-       cd $(DIR_SRC)/nagios-plugins-$(PLUGIN_VER) && make $(MAKETUNING)
-
-       # Install core
        cd $(DIR_APP) && make \
                install install-init install-commandmode install-config \
                install-webconf install-eventhandlers
@@ -124,9 +102,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        install -v -m 644 $(DIR_SRC)/config/icinga/icinga.conf \
                /etc/httpd/conf/vhosts.d/icinga.conf
 
-       # Install plugins
-       cd $(DIR_SRC)/nagios-plugins-$(PLUGIN_VER) && make install
-
        ln -svf /etc/rc.d/init.d/icinga /etc/rc.d/rc3.d/S67icinga
        ln -svf /etc/rc.d/init.d/icinga /etc/rc.d/rc0.d/K33icinga
        ln -svf /etc/rc.d/init.d/icinga /etc/rc.d/rc6.d/K33icinga
@@ -134,5 +109,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        install -v -m 644 $(DIR_SRC)/config/backup/includes/icinga \
                         /var/ipfire/backup/addons/includes/icinga
 
-       @rm -rf $(DIR_APP) $(DIR_SRC)/nagios-plugins-$(PLUGIN_VER)
+       @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/nagios-plugins b/lfs/nagios-plugins
new file mode 100644 (file)
index 0000000..30eb23f
--- /dev/null
+++ b/lfs/nagios-plugins
@@ -0,0 +1,90 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.2.1
+
+THISAPP    = nagios-plugins-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = nagios-plugins
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = fb521d5c05897f165b0b1862c1e5cb27
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && \
+               ./configure \
+                       --prefix=/usr \
+                       --libexecdir=/usr/lib/nagios/plugins \
+                       --with-nagios-user=nobody \
+                       --with-nagios-group=nobody \
+                       --without-ipv6
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index b2694709020e675970b16822d70aef4998f4dec3..102914163b6249c4655751b569a27139c040ca9d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1371,6 +1371,7 @@ buildipfire() {
   lfsmake2 netsnmpd
   lfsmake2 nagios
   lfsmake2 nagios_nrpe
+  lfsmake2 nagios-plugins
   lfsmake2 icinga
   lfsmake2 ebtables
   lfsmake2 directfb