From: Daniel Dickinson Date: Sat, 12 Mar 2011 00:54:26 +0000 (+0000) Subject: Moved Nagios programs from Network|Monitoring to Administration because nagios was... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b3a371434d4d96105b25484bd887ac75adfdea37;p=openwrt%2Fsvn-archive%2Fpackages.git Moved Nagios programs from Network|Monitoring to Administration because nagios was the only monitoring app under monitoring, and Administration already had monitoring applications SVN-Revision: 26051 --- diff --git a/admin/nagios-plugins/Makefile b/admin/nagios-plugins/Makefile new file mode 100644 index 000000000..197624fdb --- /dev/null +++ b/admin/nagios-plugins/Makefile @@ -0,0 +1,51 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=nagios-plugins +PKG_VERSION:=1.4.14 +PKG_RELEASE:=2 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/nagiosplug +PKG_MD5SUM:=a1835a48a777863ed2583de3c82446a9 + +PKG_FIXUP:=libtool no-autoreconf +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +comma:= , + +define Package/nagios-plugins + SECTION:=admin + CATEGORY:=Administration + DEPENDS:=+uclibcxx +libpq + TITLE:=plugins for Nagios checks + URL:=http://nagiosplug.sourceforge.net/ +endef + +CONFIGURE_ARGS += \ + --without-mysql \ + --with-openssl="$(STAGING_DIR)/usr" \ + --with-ping-command="/bin/ping -w %d -c %d %s" \ + --with-ping6-command="/bin/ping6 -w %d -c %d %s" \ + --with-ps-command="/bin/ps -Aopid" \ + --with-ps-cols="6" \ + --with-ps-format="%d %s %d %s %s %n" \ + --with-ps-varlist="&procuid$(comma)&procpid$(comma)&procvsz$(comma)procstat$(comma)procprog$(comma)&pos" \ + --with-uptime-command="/usr/bin/uptime" \ + --with-ssh-command="/usr/bin/ssh" \ + --with-nslookup-command="/usr/bin/nslookup" + +define Package/nagios-plugins/install + $(INSTALL_DIR) $(1)/usr/libexec/nagios + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/libexec/nagios/ +endef + +$(eval $(call BuildPackage,nagios-plugins)) diff --git a/admin/nagios-plugins/patches/002-plugins.patch b/admin/nagios-plugins/patches/002-plugins.patch new file mode 100644 index 000000000..402aabad7 --- /dev/null +++ b/admin/nagios-plugins/patches/002-plugins.patch @@ -0,0 +1,74 @@ +--- a/configure ++++ b/configure +@@ -28209,7 +28209,7 @@ fi + + if test "$ac_cv_have_decl_swapctl" = "yes"; + then +- EXTRAS="$EXTRAS check_swap" ++ EXTRAS="$EXTRAS" + { echo "$as_me:$LINENO: checking for 2-arg (SVR4) swapctl" >&5 + echo $ECHO_N "checking for 2-arg (SVR4) swapctl... $ECHO_C" >&6; } + if test "$ac_cv_type_swaptbl_t" = "yes" -a \ +@@ -28348,7 +28348,7 @@ cat >>confdefs.h <<\_ACEOF + #define HAVE_SWAP 1 + _ACEOF + +- EXTRAS="$EXTRAS check_swap" ++ EXTRAS="$EXTRAS" + fi + if test "x$ac_cv_swap_command" != "x" + then +@@ -28400,7 +28400,7 @@ cat >>confdefs.h <<_ACEOF + #define PROC_MEMINFO "$ac_cv_proc_meminfo" + _ACEOF + +- EXTRAS="$EXTRAS check_swap" ++ EXTRAS="$EXTRAS" + fi + + # Extract the first word of "dig", so it can be a program name with args. +--- a/plugins/Makefile.am ++++ b/plugins/Makefile.am +@@ -34,8 +34,8 @@ libexec_PROGRAMS = check_apt check_clust + check_tcp_programs = check_ftp check_imap check_nntp check_pop \ + check_udp check_clamd @check_tcp_ssl@ + +-EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \ +- check_swap check_fping check_ldap check_game check_dig \ ++EXTRA_PROGRAMS = check_mysql check_radius check_snmp check_hpjd \ ++ check_fping check_ldap check_game check_dig \ + check_nagios check_by_ssh check_dns check_nt check_ide_smart \ + check_procs check_mysql_query check_apt + +--- a/plugins/Makefile.in ++++ b/plugins/Makefile.in +@@ -32,7 +32,7 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + libexec_PROGRAMS = check_apt$(EXEEXT) check_cluster$(EXEEXT) \ +- check_disk$(EXEEXT) check_dummy$(EXEEXT) check_http$(EXEEXT) \ ++ check_dummy$(EXEEXT) check_http$(EXEEXT) \ + check_load$(EXEEXT) check_mrtg$(EXEEXT) \ + check_mrtgtraf$(EXEEXT) check_ntp$(EXEEXT) \ + check_ntp_peer$(EXEEXT) check_nwstat$(EXEEXT) \ +@@ -41,8 +41,8 @@ libexec_PROGRAMS = check_apt$(EXEEXT) ch + check_time$(EXEEXT) check_ntp_time$(EXEEXT) check_ups$(EXEEXT) \ + check_users$(EXEEXT) negate$(EXEEXT) urlize$(EXEEXT) @EXTRAS@ + EXTRA_PROGRAMS = check_mysql$(EXEEXT) check_radius$(EXEEXT) \ +- check_pgsql$(EXEEXT) check_snmp$(EXEEXT) check_hpjd$(EXEEXT) \ +- check_swap$(EXEEXT) check_fping$(EXEEXT) check_ldap$(EXEEXT) \ ++ check_snmp$(EXEEXT) check_hpjd$(EXEEXT) \ ++ check_fping$(EXEEXT) check_ldap$(EXEEXT) \ + check_game$(EXEEXT) check_dig$(EXEEXT) check_nagios$(EXEEXT) \ + check_by_ssh$(EXEEXT) check_dns$(EXEEXT) check_nt$(EXEEXT) \ + check_ide_smart$(EXEEXT) check_procs$(EXEEXT) \ +--- a/plugins/check_pgsql.c ++++ b/plugins/check_pgsql.c +@@ -39,6 +39,7 @@ const char *email = "nagiosplug-devel@li + #include + #include + ++#define NAMEDATALEN 64 + #define DEFAULT_DB "template1" + #define DEFAULT_HOST "127.0.0.1" + diff --git a/admin/nagios-plugins/patches/003-pgsl-header-fix.patch b/admin/nagios-plugins/patches/003-pgsl-header-fix.patch new file mode 100644 index 000000000..8496e80a4 --- /dev/null +++ b/admin/nagios-plugins/patches/003-pgsl-header-fix.patch @@ -0,0 +1,11 @@ +--- a/plugins/check_pgsql.c ++++ b/plugins/check_pgsql.c +@@ -37,7 +37,7 @@ const char *email = "nagiosplug-devel@li + + #include "netutils.h" + #include +-#include ++#include + + #define NAMEDATALEN 64 + #define DEFAULT_DB "template1" diff --git a/admin/nagios/Makefile b/admin/nagios/Makefile new file mode 100644 index 000000000..fc9cb8715 --- /dev/null +++ b/admin/nagios/Makefile @@ -0,0 +1,61 @@ +# +# Copyright (C) 2008-2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=nagios +PKG_VERSION:=2.10 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/nagios +PKG_MD5SUM:=8c3a29e138f2ff8c8abbd3dd8a40c4b6 + +include $(INCLUDE_DIR)/package.mk + +define Package/nagios + SECTION:=admin + CATEGORY:=Administration + DEPENDS:=+libpthread +microperl +libltdl + TITLE:=service and network monitoring program + URL:=http://www.nagios.org/ +endef + +define Package/nagios/description + service and network monitoring program +endef + +EXTRA_CFLAGS += $(TARGET_CPPFLAGS) + +CONFIGURE_ARGS += \ + --with-nagios-user="root" \ + --with-nagios-group="root" \ + --sysconfdir="/etc/nagios" \ + --without-gd-lib \ + --without-gd-inc \ + CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + INSTALL_OPTS="" \ + STRIP=: \ + all install install-config +endef + +define Package/nagios/install + $(INSTALL_DIR) $(1)/etc/nagios + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/nagios/* $(1)/etc/nagios/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{nagios,nagiostats} $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/share + $(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/ +endef + +$(eval $(call BuildPackage,nagios)) diff --git a/admin/nrpe/Makefile b/admin/nrpe/Makefile new file mode 100644 index 000000000..184cc4242 --- /dev/null +++ b/admin/nrpe/Makefile @@ -0,0 +1,92 @@ +# +# Copyright (C) 2007-2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=nrpe +PKG_VERSION:=2.12 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/nagios +PKG_MD5SUM:=b2d75e2962f1e3151ef58794d60c9e97 + +include $(INCLUDE_DIR)/package.mk + +define Package/nrpe + SECTION:=admin + CATEGORY:=Administration + DEPENDS:=+libopenssl + TITLE:=Daemon to execute Nagios check commands on remote hosts + URL:=http://www.nagios.org/download +endef + +define Package/nrpe/description + The NRPE addon is designed to allow you to execute Nagios plugins on + remote Linux/Unix machines. The main reason for doing this is to allow + Nagios to monitor "local" resources (like CPU load, memory usage, etc.) + on remote machines. Since these public resources are not usually + exposed to external machines, an agent like NRPE must be installed on + the remote Linux/Unix machines. +endef + +define Package/nrpe/postinst +#!/bin/sh + +id=50 +name=nagios +home=/var/run/nagios +shell=/bin/false + +# do not change below +# check if we are on real system +if [ -z "$${IPKG_INSTROOT}" ]; then + # create copies of passwd and group, if we use squashfs + rootfs=`mount |awk '/root/ { print $$5 }'` + if [ "$$rootfs" = "squashfs" ]; then + if [ -h /etc/group ]; then + rm /etc/group + cp -p /rom/etc/group /etc/group + fi + if [ -h /etc/passwd ]; then + rm /etc/passwd + cp -p /rom/etc/passwd /etc/passwd + fi + fi +fi + +echo "" +if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/group)" ]; then + echo "adding group $$name to /etc/group" + echo "$${name}:x:$${id}:" >> $${IPKG_INSTROOT}/etc/group +fi +if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/passwd)" ]; then + echo "adding user $$name to /etc/passwd" + echo "$${name}:x:$${id}:$${id}:$${name}:$${home}:$${shell}" >> $${IPKG_INSTROOT}/etc/passwd +fi +endef + +CONFIGURE_ARGS += \ + --with-ssl="$(STAGING_DIR)/usr" \ + --with-ssl-lib="$(STAGING_DIR)/usr/lib" + +define Package/nrpe/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_DATA) ./files/nrpe.cfg $(1)/etc/nrpe.cfg + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/nrpe $(1)/usr/sbin + $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME) +endef + +$(eval $(call RequireCommand,openssl, \ + $(PKG_NAME) requires openssl installed on the host-system. \ +)) + +$(eval $(call BuildPackage,nrpe)) + diff --git a/admin/nrpe/files/nrpe.cfg b/admin/nrpe/files/nrpe.cfg new file mode 100644 index 000000000..e84bed7f1 --- /dev/null +++ b/admin/nrpe/files/nrpe.cfg @@ -0,0 +1,208 @@ +############################################################################# +# Sample NRPE Config File +# Written by: Ethan Galstad (nagios@nagios.org) +# +# Last Modified: 03-09-2007 +# +# NOTES: +# This is a sample configuration file for the NRPE daemon. It needs to be +# located on the remote host that is running the NRPE daemon, not the host +# from which the check_nrpe client is being executed. +############################################################################# + + +# PID FILE +# The name of the file in which the NRPE daemon should write it's process ID +# number. The file is only written if the NRPE daemon is started by the root +# user and is running in standalone mode. + +pid_file=/var/run/nrpe.pid + + + +# PORT NUMBER +# Port number we should wait for connections on. +# NOTE: This must be a non-priviledged port (i.e. > 1024). +# NOTE: This option is ignored if NRPE is running under either inetd or xinetd + +server_port=5666 + + + +# SERVER ADDRESS +# Address that nrpe should bind to in case there are more than one interface +# and you do not want nrpe to bind on all interfaces. +# NOTE: This option is ignored if NRPE is running under either inetd or xinetd + +server_address=192.168.1.1 + + +# NRPE USER +# This determines the effective user that the NRPE daemon should run as. +# You can either supply a username or a UID. +# +# NOTE: This option is ignored if NRPE is running under either inetd or xinetd + +nrpe_user=nagios + + + +# NRPE GROUP +# This determines the effective group that the NRPE daemon should run as. +# You can either supply a group name or a GID. +# +# NOTE: This option is ignored if NRPE is running under either inetd or xinetd + +nrpe_group=nagios + + + +# ALLOWED HOST ADDRESSES +# This is an optional comma-delimited list of IP address or hostnames +# that are allowed to talk to the NRPE daemon. +# +# Note: The daemon only does rudimentary checking of the client's IP +# address. I would highly recommend adding entries in your /etc/hosts.allow +# file to allow only the specified host to connect to the port +# you are running this daemon on. +# +# NOTE: This option is ignored if NRPE is running under either inetd or xinetd + +allowed_hosts=192.168.1.2 + + + +# COMMAND ARGUMENT PROCESSING +# This option determines whether or not the NRPE daemon will allow clients +# to specify arguments to commands that are executed. This option only works +# if the daemon was configured with the --enable-command-args configure script +# option. +# +# *** ENABLING THIS OPTION IS A SECURITY RISK! *** +# Read the SECURITY file for information on some of the security implications +# of enabling this variable. +# +# Values: 0=do not allow arguments, 1=allow command arguments + +dont_blame_nrpe=0 + + + +# COMMAND PREFIX +# This option allows you to prefix all commands with a user-defined string. +# A space is automatically added between the specified prefix string and the +# command line from the command definition. +# +# *** THIS EXAMPLE MAY POSE A POTENTIAL SECURITY RISK, SO USE WITH CAUTION! *** +# Usage scenario: +# Execute restricted commmands using sudo. For this to work, you need to add +# the nagios user to your /etc/sudoers. An example entry for alllowing +# execution of the plugins from might be: +# +# nagios ALL=(ALL) NOPASSWD: /usr/lib/nagios/plugins/ +# +# This lets the nagios user run all commands in that directory (and only them) +# without asking for a password. If you do this, make sure you don't give +# random users write access to that directory or its contents! + +# command_prefix=/usr/bin/sudo + + + +# DEBUGGING OPTION +# This option determines whether or not debugging messages are logged to the +# syslog facility. +# Values: 0=debugging off, 1=debugging on + +debug=0 + + + +# COMMAND TIMEOUT +# This specifies the maximum number of seconds that the NRPE daemon will +# allow plugins to finish executing before killing them off. + +command_timeout=60 + + + +# CONNECTION TIMEOUT +# This specifies the maximum number of seconds that the NRPE daemon will +# wait for a connection to be established before exiting. This is sometimes +# seen where a network problem stops the SSL being established even though +# all network sessions are connected. This causes the nrpe daemons to +# accumulate, eating system resources. Do not set this too low. + +connection_timeout=300 + + + +# WEEK RANDOM SEED OPTION +# This directive allows you to use SSL even if your system does not have +# a /dev/random or /dev/urandom (on purpose or because the necessary patches +# were not applied). The random number generator will be seeded from a file +# which is either a file pointed to by the environment valiable $RANDFILE +# or $HOME/.rnd. If neither exists, the pseudo random number generator will +# be initialized and a warning will be issued. +# Values: 0=only seed from /dev/[u]random, 1=also seed from weak randomness + +#allow_weak_random_seed=1 + + + +# INCLUDE CONFIG FILE +# This directive allows you to include definitions from an external config file. + +#include= + + + +# INCLUDE CONFIG DIRECTORY +# This directive allows you to include definitions from config files (with a +# .cfg extension) in one or more directories (with recursion). + +#include_dir= +#include_dir= + + + +# COMMAND DEFINITIONS +# Command definitions that this daemon will run. Definitions +# are in the following format: +# +# command[]= +# +# When the daemon receives a request to return the results of +# it will execute the command specified by the argument. +# +# Unlike Nagios, the command line cannot contain macros - it must be +# typed exactly as it should be executed. +# +# Note: Any plugins that are used in the command lines must reside +# on the machine that this daemon is running on! The examples below +# assume that you have plugins installed in a /usr/local/nagios/libexec +# directory. Also note that you will have to modify the definitions below +# to match the argument format the plugins expect. Remember, these are +# examples only! + + +# The following examples use hardcoded command arguments... + +command[check_users]=/usr/libexec/nagios/check_users -w 3 -c 5 +command[check_load]=/usr/libexec/nagios/check_load -w 7,4,2 -c 10,5,3 +command[check_tmp]=/usr/libexec/nagios/check_disk -w 50% -c 25% -p /tmp +command[check_zombie_procs]=/usr/libexec/nagios/check_procs -w 1 -c 3 -s Z +command[check_total_procs]=/usr/libexec/nagios/check_procs -w 25 -c 30 + + + +# The following examples allow user-supplied arguments and can +# only be used if the NRPE daemon was compiled with support for +# command arguments *AND* the dont_blame_nrpe directive in this +# config file is set to '1'. This poses a potential security risk, so +# make sure you read the SECURITY file before doing this. + +#command[check_users]=/usr/lib/check_users -w $ARG1$ -c $ARG2$ +#command[check_load]=/usr/lib/check_load -w $ARG1$ -c $ARG2$ +#command[check_disk]=/usr/lib/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$ +#command[check_procs]=/usr/lib/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$ diff --git a/admin/nrpe/files/nrpe.init b/admin/nrpe/files/nrpe.init new file mode 100644 index 000000000..e1ccf8ad9 --- /dev/null +++ b/admin/nrpe/files/nrpe.init @@ -0,0 +1,12 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2007 OpenWrt.org + +START=70 + +start() { + /usr/sbin/nrpe -c /etc/nrpe.cfg -d +} + +stop() { + killall nrpe +} diff --git a/admin/nrpe/patches/100-openssl-dh.patch b/admin/nrpe/patches/100-openssl-dh.patch new file mode 100644 index 000000000..0b7f8c98a --- /dev/null +++ b/admin/nrpe/patches/100-openssl-dh.patch @@ -0,0 +1,17 @@ +--- a/configure ++++ b/configure +@@ -6694,11 +6694,9 @@ + + echo "" + echo "*** Generating DH Parameters for SSL/TLS ***" +- if test -f "$ssldir/sbin/openssl"; then +- sslbin=$ssldir/sbin/openssl +- else +- sslbin=$ssldir/bin/openssl +- fi ++ # Use host openssl as it just generates some random stuff, ++ # nothing machine-specific ++ sslbin=/usr/bin/openssl + # awk to strip off meta data at bottom of dhparam output + $sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/dh.h + fi diff --git a/admin/nsca/Makefile b/admin/nsca/Makefile new file mode 100644 index 000000000..56789c76d --- /dev/null +++ b/admin/nsca/Makefile @@ -0,0 +1,60 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=nsca +PKG_VERSION:=2.7.2 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/nagios +PKG_MD5SUM:=33a98e7975f633a9489d7a8938ed6131 + +include $(INCLUDE_DIR)/package.mk + +define Package/send-nsca + SECTION:=admin + CATEGORY:=Administration + DEPENDS:=+libmcrypt + TITLE:=Nagios Service Check Acceptor (NSCA) client + URL:=http://www.nagios.org/ +endef + +define Package/send-nsca/description + This is the client program that is used to send service check + information from a remote machine to the nsca daemon on the central + machine that runs Nagios. +endef + +define Package/send-nsca/conffiles +/etc/send_nsca.cfg +endef + +define Build/Configure + $(call Build/Configure/Default, \ + --with-nsca-user="root" \ + --with-nsca-grp="root" \ + --with-libmcrypt-prefix="$(STAGING_DIR)/usr" \ + , \ + CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \ + ) +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) \ + send_nsca +endef + +define Package/send-nsca/install + $(INSTALL_DIR) $(1)/etc + $(INSTALL_CONF) $(PKG_BUILD_DIR)/sample-config/send_nsca.cfg $(1)/etc/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/send_nsca $(1)/usr/sbin/ +endef + +$(eval $(call BuildPackage,send-nsca)) diff --git a/net/nagios-plugins/Makefile b/net/nagios-plugins/Makefile deleted file mode 100644 index 68490810e..000000000 --- a/net/nagios-plugins/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (C) 2008-2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=nagios-plugins -PKG_VERSION:=1.4.14 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/nagiosplug -PKG_MD5SUM:=a1835a48a777863ed2583de3c82446a9 - -PKG_FIXUP:=libtool no-autoreconf -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -comma:= , - -define Package/nagios-plugins - SECTION:=net - CATEGORY:=Network - SUBMENU:=Monitoring - DEPENDS:=+uclibcxx +libpq - TITLE:=plugins for Nagios checks - URL:=http://nagiosplug.sourceforge.net/ -endef - -CONFIGURE_ARGS += \ - --without-mysql \ - --with-openssl="$(STAGING_DIR)/usr" \ - --with-ping-command="/bin/ping -w %d -c %d %s" \ - --with-ping6-command="/bin/ping6 -w %d -c %d %s" \ - --with-ps-command="/bin/ps -Aopid" \ - --with-ps-cols="6" \ - --with-ps-format="%d %s %d %s %s %n" \ - --with-ps-varlist="&procuid$(comma)&procpid$(comma)&procvsz$(comma)procstat$(comma)procprog$(comma)&pos" \ - --with-uptime-command="/usr/bin/uptime" \ - --with-ssh-command="/usr/bin/ssh" \ - --with-nslookup-command="/usr/bin/nslookup" - -define Package/nagios-plugins/install - $(INSTALL_DIR) $(1)/usr/libexec/nagios - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/libexec/nagios/ -endef - -$(eval $(call BuildPackage,nagios-plugins)) diff --git a/net/nagios-plugins/patches/002-plugins.patch b/net/nagios-plugins/patches/002-plugins.patch deleted file mode 100644 index 402aabad7..000000000 --- a/net/nagios-plugins/patches/002-plugins.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- a/configure -+++ b/configure -@@ -28209,7 +28209,7 @@ fi - - if test "$ac_cv_have_decl_swapctl" = "yes"; - then -- EXTRAS="$EXTRAS check_swap" -+ EXTRAS="$EXTRAS" - { echo "$as_me:$LINENO: checking for 2-arg (SVR4) swapctl" >&5 - echo $ECHO_N "checking for 2-arg (SVR4) swapctl... $ECHO_C" >&6; } - if test "$ac_cv_type_swaptbl_t" = "yes" -a \ -@@ -28348,7 +28348,7 @@ cat >>confdefs.h <<\_ACEOF - #define HAVE_SWAP 1 - _ACEOF - -- EXTRAS="$EXTRAS check_swap" -+ EXTRAS="$EXTRAS" - fi - if test "x$ac_cv_swap_command" != "x" - then -@@ -28400,7 +28400,7 @@ cat >>confdefs.h <<_ACEOF - #define PROC_MEMINFO "$ac_cv_proc_meminfo" - _ACEOF - -- EXTRAS="$EXTRAS check_swap" -+ EXTRAS="$EXTRAS" - fi - - # Extract the first word of "dig", so it can be a program name with args. ---- a/plugins/Makefile.am -+++ b/plugins/Makefile.am -@@ -34,8 +34,8 @@ libexec_PROGRAMS = check_apt check_clust - check_tcp_programs = check_ftp check_imap check_nntp check_pop \ - check_udp check_clamd @check_tcp_ssl@ - --EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \ -- check_swap check_fping check_ldap check_game check_dig \ -+EXTRA_PROGRAMS = check_mysql check_radius check_snmp check_hpjd \ -+ check_fping check_ldap check_game check_dig \ - check_nagios check_by_ssh check_dns check_nt check_ide_smart \ - check_procs check_mysql_query check_apt - ---- a/plugins/Makefile.in -+++ b/plugins/Makefile.in -@@ -32,7 +32,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - libexec_PROGRAMS = check_apt$(EXEEXT) check_cluster$(EXEEXT) \ -- check_disk$(EXEEXT) check_dummy$(EXEEXT) check_http$(EXEEXT) \ -+ check_dummy$(EXEEXT) check_http$(EXEEXT) \ - check_load$(EXEEXT) check_mrtg$(EXEEXT) \ - check_mrtgtraf$(EXEEXT) check_ntp$(EXEEXT) \ - check_ntp_peer$(EXEEXT) check_nwstat$(EXEEXT) \ -@@ -41,8 +41,8 @@ libexec_PROGRAMS = check_apt$(EXEEXT) ch - check_time$(EXEEXT) check_ntp_time$(EXEEXT) check_ups$(EXEEXT) \ - check_users$(EXEEXT) negate$(EXEEXT) urlize$(EXEEXT) @EXTRAS@ - EXTRA_PROGRAMS = check_mysql$(EXEEXT) check_radius$(EXEEXT) \ -- check_pgsql$(EXEEXT) check_snmp$(EXEEXT) check_hpjd$(EXEEXT) \ -- check_swap$(EXEEXT) check_fping$(EXEEXT) check_ldap$(EXEEXT) \ -+ check_snmp$(EXEEXT) check_hpjd$(EXEEXT) \ -+ check_fping$(EXEEXT) check_ldap$(EXEEXT) \ - check_game$(EXEEXT) check_dig$(EXEEXT) check_nagios$(EXEEXT) \ - check_by_ssh$(EXEEXT) check_dns$(EXEEXT) check_nt$(EXEEXT) \ - check_ide_smart$(EXEEXT) check_procs$(EXEEXT) \ ---- a/plugins/check_pgsql.c -+++ b/plugins/check_pgsql.c -@@ -39,6 +39,7 @@ const char *email = "nagiosplug-devel@li - #include - #include - -+#define NAMEDATALEN 64 - #define DEFAULT_DB "template1" - #define DEFAULT_HOST "127.0.0.1" - diff --git a/net/nagios-plugins/patches/003-pgsl-header-fix.patch b/net/nagios-plugins/patches/003-pgsl-header-fix.patch deleted file mode 100644 index 8496e80a4..000000000 --- a/net/nagios-plugins/patches/003-pgsl-header-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/plugins/check_pgsql.c -+++ b/plugins/check_pgsql.c -@@ -37,7 +37,7 @@ const char *email = "nagiosplug-devel@li - - #include "netutils.h" - #include --#include -+#include - - #define NAMEDATALEN 64 - #define DEFAULT_DB "template1" diff --git a/net/nagios/Makefile b/net/nagios/Makefile deleted file mode 100644 index 734caf6f1..000000000 --- a/net/nagios/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -# -# Copyright (C) 2008-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=nagios -PKG_VERSION:=2.10 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/nagios -PKG_MD5SUM:=8c3a29e138f2ff8c8abbd3dd8a40c4b6 - -include $(INCLUDE_DIR)/package.mk - -define Package/nagios - SECTION:=net - CATEGORY:=Network - SUBMENU:=Monitoring - DEPENDS:=+libpthread +microperl +libltdl - TITLE:=service and network monitoring program - URL:=http://www.nagios.org/ -endef - -define Package/nagios/description - service and network monitoring program -endef - -EXTRA_CFLAGS += $(TARGET_CPPFLAGS) - -CONFIGURE_ARGS += \ - --with-nagios-user="root" \ - --with-nagios-group="root" \ - --sysconfdir="/etc/nagios" \ - --without-gd-lib \ - --without-gd-inc \ - CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - INSTALL_OPTS="" \ - STRIP=: \ - all install install-config -endef - -define Package/nagios/install - $(INSTALL_DIR) $(1)/etc/nagios - $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/nagios/* $(1)/etc/nagios/ - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{nagios,nagiostats} $(1)/usr/bin/ - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ - $(INSTALL_DIR) $(1)/usr/share - $(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/ -endef - -$(eval $(call BuildPackage,nagios)) diff --git a/net/nrpe/Makefile b/net/nrpe/Makefile deleted file mode 100644 index 06ca352f6..000000000 --- a/net/nrpe/Makefile +++ /dev/null @@ -1,93 +0,0 @@ -# -# Copyright (C) 2007-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=nrpe -PKG_VERSION:=2.12 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/nagios -PKG_MD5SUM:=b2d75e2962f1e3151ef58794d60c9e97 - -include $(INCLUDE_DIR)/package.mk - -define Package/nrpe - SECTION:=net - CATEGORY:=Network - SUBMENU:=Monitoring - DEPENDS:=+libopenssl - TITLE:=Daemon to execute Nagios check commands on remote hosts - URL:=http://www.nagios.org/download -endef - -define Package/nrpe/description - The NRPE addon is designed to allow you to execute Nagios plugins on - remote Linux/Unix machines. The main reason for doing this is to allow - Nagios to monitor "local" resources (like CPU load, memory usage, etc.) - on remote machines. Since these public resources are not usually - exposed to external machines, an agent like NRPE must be installed on - the remote Linux/Unix machines. -endef - -define Package/nrpe/postinst -#!/bin/sh - -id=50 -name=nagios -home=/var/run/nagios -shell=/bin/false - -# do not change below -# check if we are on real system -if [ -z "$${IPKG_INSTROOT}" ]; then - # create copies of passwd and group, if we use squashfs - rootfs=`mount |awk '/root/ { print $$5 }'` - if [ "$$rootfs" = "squashfs" ]; then - if [ -h /etc/group ]; then - rm /etc/group - cp -p /rom/etc/group /etc/group - fi - if [ -h /etc/passwd ]; then - rm /etc/passwd - cp -p /rom/etc/passwd /etc/passwd - fi - fi -fi - -echo "" -if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/group)" ]; then - echo "adding group $$name to /etc/group" - echo "$${name}:x:$${id}:" >> $${IPKG_INSTROOT}/etc/group -fi -if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/passwd)" ]; then - echo "adding user $$name to /etc/passwd" - echo "$${name}:x:$${id}:$${id}:$${name}:$${home}:$${shell}" >> $${IPKG_INSTROOT}/etc/passwd -fi -endef - -CONFIGURE_ARGS += \ - --with-ssl="$(STAGING_DIR)/usr" \ - --with-ssl-lib="$(STAGING_DIR)/usr/lib" - -define Package/nrpe/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_DIR) $(1)/etc - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_DATA) ./files/nrpe.cfg $(1)/etc/nrpe.cfg - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/nrpe $(1)/usr/sbin - $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME) -endef - -$(eval $(call RequireCommand,openssl, \ - $(PKG_NAME) requires openssl installed on the host-system. \ -)) - -$(eval $(call BuildPackage,nrpe)) - diff --git a/net/nrpe/files/nrpe.cfg b/net/nrpe/files/nrpe.cfg deleted file mode 100644 index e84bed7f1..000000000 --- a/net/nrpe/files/nrpe.cfg +++ /dev/null @@ -1,208 +0,0 @@ -############################################################################# -# Sample NRPE Config File -# Written by: Ethan Galstad (nagios@nagios.org) -# -# Last Modified: 03-09-2007 -# -# NOTES: -# This is a sample configuration file for the NRPE daemon. It needs to be -# located on the remote host that is running the NRPE daemon, not the host -# from which the check_nrpe client is being executed. -############################################################################# - - -# PID FILE -# The name of the file in which the NRPE daemon should write it's process ID -# number. The file is only written if the NRPE daemon is started by the root -# user and is running in standalone mode. - -pid_file=/var/run/nrpe.pid - - - -# PORT NUMBER -# Port number we should wait for connections on. -# NOTE: This must be a non-priviledged port (i.e. > 1024). -# NOTE: This option is ignored if NRPE is running under either inetd or xinetd - -server_port=5666 - - - -# SERVER ADDRESS -# Address that nrpe should bind to in case there are more than one interface -# and you do not want nrpe to bind on all interfaces. -# NOTE: This option is ignored if NRPE is running under either inetd or xinetd - -server_address=192.168.1.1 - - -# NRPE USER -# This determines the effective user that the NRPE daemon should run as. -# You can either supply a username or a UID. -# -# NOTE: This option is ignored if NRPE is running under either inetd or xinetd - -nrpe_user=nagios - - - -# NRPE GROUP -# This determines the effective group that the NRPE daemon should run as. -# You can either supply a group name or a GID. -# -# NOTE: This option is ignored if NRPE is running under either inetd or xinetd - -nrpe_group=nagios - - - -# ALLOWED HOST ADDRESSES -# This is an optional comma-delimited list of IP address or hostnames -# that are allowed to talk to the NRPE daemon. -# -# Note: The daemon only does rudimentary checking of the client's IP -# address. I would highly recommend adding entries in your /etc/hosts.allow -# file to allow only the specified host to connect to the port -# you are running this daemon on. -# -# NOTE: This option is ignored if NRPE is running under either inetd or xinetd - -allowed_hosts=192.168.1.2 - - - -# COMMAND ARGUMENT PROCESSING -# This option determines whether or not the NRPE daemon will allow clients -# to specify arguments to commands that are executed. This option only works -# if the daemon was configured with the --enable-command-args configure script -# option. -# -# *** ENABLING THIS OPTION IS A SECURITY RISK! *** -# Read the SECURITY file for information on some of the security implications -# of enabling this variable. -# -# Values: 0=do not allow arguments, 1=allow command arguments - -dont_blame_nrpe=0 - - - -# COMMAND PREFIX -# This option allows you to prefix all commands with a user-defined string. -# A space is automatically added between the specified prefix string and the -# command line from the command definition. -# -# *** THIS EXAMPLE MAY POSE A POTENTIAL SECURITY RISK, SO USE WITH CAUTION! *** -# Usage scenario: -# Execute restricted commmands using sudo. For this to work, you need to add -# the nagios user to your /etc/sudoers. An example entry for alllowing -# execution of the plugins from might be: -# -# nagios ALL=(ALL) NOPASSWD: /usr/lib/nagios/plugins/ -# -# This lets the nagios user run all commands in that directory (and only them) -# without asking for a password. If you do this, make sure you don't give -# random users write access to that directory or its contents! - -# command_prefix=/usr/bin/sudo - - - -# DEBUGGING OPTION -# This option determines whether or not debugging messages are logged to the -# syslog facility. -# Values: 0=debugging off, 1=debugging on - -debug=0 - - - -# COMMAND TIMEOUT -# This specifies the maximum number of seconds that the NRPE daemon will -# allow plugins to finish executing before killing them off. - -command_timeout=60 - - - -# CONNECTION TIMEOUT -# This specifies the maximum number of seconds that the NRPE daemon will -# wait for a connection to be established before exiting. This is sometimes -# seen where a network problem stops the SSL being established even though -# all network sessions are connected. This causes the nrpe daemons to -# accumulate, eating system resources. Do not set this too low. - -connection_timeout=300 - - - -# WEEK RANDOM SEED OPTION -# This directive allows you to use SSL even if your system does not have -# a /dev/random or /dev/urandom (on purpose or because the necessary patches -# were not applied). The random number generator will be seeded from a file -# which is either a file pointed to by the environment valiable $RANDFILE -# or $HOME/.rnd. If neither exists, the pseudo random number generator will -# be initialized and a warning will be issued. -# Values: 0=only seed from /dev/[u]random, 1=also seed from weak randomness - -#allow_weak_random_seed=1 - - - -# INCLUDE CONFIG FILE -# This directive allows you to include definitions from an external config file. - -#include= - - - -# INCLUDE CONFIG DIRECTORY -# This directive allows you to include definitions from config files (with a -# .cfg extension) in one or more directories (with recursion). - -#include_dir= -#include_dir= - - - -# COMMAND DEFINITIONS -# Command definitions that this daemon will run. Definitions -# are in the following format: -# -# command[]= -# -# When the daemon receives a request to return the results of -# it will execute the command specified by the argument. -# -# Unlike Nagios, the command line cannot contain macros - it must be -# typed exactly as it should be executed. -# -# Note: Any plugins that are used in the command lines must reside -# on the machine that this daemon is running on! The examples below -# assume that you have plugins installed in a /usr/local/nagios/libexec -# directory. Also note that you will have to modify the definitions below -# to match the argument format the plugins expect. Remember, these are -# examples only! - - -# The following examples use hardcoded command arguments... - -command[check_users]=/usr/libexec/nagios/check_users -w 3 -c 5 -command[check_load]=/usr/libexec/nagios/check_load -w 7,4,2 -c 10,5,3 -command[check_tmp]=/usr/libexec/nagios/check_disk -w 50% -c 25% -p /tmp -command[check_zombie_procs]=/usr/libexec/nagios/check_procs -w 1 -c 3 -s Z -command[check_total_procs]=/usr/libexec/nagios/check_procs -w 25 -c 30 - - - -# The following examples allow user-supplied arguments and can -# only be used if the NRPE daemon was compiled with support for -# command arguments *AND* the dont_blame_nrpe directive in this -# config file is set to '1'. This poses a potential security risk, so -# make sure you read the SECURITY file before doing this. - -#command[check_users]=/usr/lib/check_users -w $ARG1$ -c $ARG2$ -#command[check_load]=/usr/lib/check_load -w $ARG1$ -c $ARG2$ -#command[check_disk]=/usr/lib/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$ -#command[check_procs]=/usr/lib/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$ diff --git a/net/nrpe/files/nrpe.init b/net/nrpe/files/nrpe.init deleted file mode 100644 index e1ccf8ad9..000000000 --- a/net/nrpe/files/nrpe.init +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2007 OpenWrt.org - -START=70 - -start() { - /usr/sbin/nrpe -c /etc/nrpe.cfg -d -} - -stop() { - killall nrpe -} diff --git a/net/nrpe/patches/100-openssl-dh.patch b/net/nrpe/patches/100-openssl-dh.patch deleted file mode 100644 index 0b7f8c98a..000000000 --- a/net/nrpe/patches/100-openssl-dh.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/configure -+++ b/configure -@@ -6694,11 +6694,9 @@ - - echo "" - echo "*** Generating DH Parameters for SSL/TLS ***" -- if test -f "$ssldir/sbin/openssl"; then -- sslbin=$ssldir/sbin/openssl -- else -- sslbin=$ssldir/bin/openssl -- fi -+ # Use host openssl as it just generates some random stuff, -+ # nothing machine-specific -+ sslbin=/usr/bin/openssl - # awk to strip off meta data at bottom of dhparam output - $sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/dh.h - fi diff --git a/net/nsca/Makefile b/net/nsca/Makefile deleted file mode 100644 index cf596cb2a..000000000 --- a/net/nsca/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=nsca -PKG_VERSION:=2.7.2 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/nagios -PKG_MD5SUM:=33a98e7975f633a9489d7a8938ed6131 - -include $(INCLUDE_DIR)/package.mk - -define Package/send-nsca - SECTION:=net - CATEGORY:=Network - SUBMENU:=Monitoring - DEPENDS:=+libmcrypt - TITLE:=Nagios Service Check Acceptor (NSCA) client - URL:=http://www.nagios.org/ -endef - -define Package/send-nsca/description - This is the client program that is used to send service check - information from a remote machine to the nsca daemon on the central - machine that runs Nagios. -endef - -define Package/send-nsca/conffiles -/etc/send_nsca.cfg -endef - -define Build/Configure - $(call Build/Configure/Default, \ - --with-nsca-user="root" \ - --with-nsca-grp="root" \ - --with-libmcrypt-prefix="$(STAGING_DIR)/usr" \ - , \ - CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \ - ) -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - send_nsca -endef - -define Package/send-nsca/install - $(INSTALL_DIR) $(1)/etc - $(INSTALL_CONF) $(PKG_BUILD_DIR)/sample-config/send_nsca.cfg $(1)/etc/ - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/send_nsca $(1)/usr/sbin/ -endef - -$(eval $(call BuildPackage,send-nsca))