From 63734f52ab1b4b2c17545b26fc41016d6bbd80bd Mon Sep 17 00:00:00 2001 From: Monitoring Plugins Development Team Date: Sat, 18 Jan 2014 03:40:24 -0500 Subject: Project rename initial commit. This is an initial take at renaming the project to Monitoring Plugins. It's not expected to be fully complete, and it is expected to break things (The perl module for instance). More testing will be required before this goes mainline. --- plugins/tests/check_http.t | 2 +- plugins/tests/var/ps_axwo.debian | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/tests') diff --git a/plugins/tests/check_http.t b/plugins/tests/check_http.t index c3085e13..2c89beb0 100755 --- a/plugins/tests/check_http.t +++ b/plugins/tests/check_http.t @@ -7,7 +7,7 @@ # Country Name (2 letter code) [AU]:UK # State or Province Name (full name) [Some-State]:Derbyshire # Locality Name (eg, city) []:Belper -# Organization Name (eg, company) [Internet Widgits Pty Ltd]:Nagios Plugins +# Organization Name (eg, company) [Internet Widgits Pty Ltd]:Monitoring Plugins # Organizational Unit Name (eg, section) []: # Common Name (eg, YOUR name) []:Ton Voon # Email Address []:tonvoon@mac.com diff --git a/plugins/tests/var/ps_axwo.debian b/plugins/tests/var/ps_axwo.debian index 0d7d7bce..38e284af 100644 --- a/plugins/tests/var/ps_axwo.debian +++ b/plugins/tests/var/ps_axwo.debian @@ -31,7 +31,7 @@ S 0 6907 1 2308 892 0.0 mysqld_safe /bin/sh /usr/bin/mysqld_ S 103 6944 6907 123220 27724 0.0 mysqld /usr/sbin/mysqld --basedir=/usr --datadir=/var/lib/mysql --user=mysql --pid-file=/var/run/mysqld/mysqld.pid --skip-locking --port=3306 --socket=/var/run/mysqld/mysqld.sock S 0 6945 6907 1488 420 0.0 logger logger -p daemon.err -t mysqld_safe -i -t mysqld S 1001 17778 1 6436 1588 0.0 snmpd /usr/sbin/snmpd -u nagios -Lsd -Lf /dev/null -p/var/run/snmpd.pid -Ss 0 17789 1 9496 5556 0.0 snmptrapd /usr/sbin/snmptrapd -t -m ALL -M /usr/share/snmp/mibs:/usr/local/nagios/snmp/load -p /var/run/snmptrapd.pid +Ss 0 17789 1 9496 5556 0.0 snmptrapd /usr/sbin/snmptrapd -t -m ALL -M /usr/share/snmp/mibs:/usr/local/monitoring/snmp/load -p /var/run/snmptrapd.pid Ss 0 847 2319 14452 1752 0.0 sshd sshd: tonvoon [priv] S 1000 857 847 14616 1832 0.0 sshd sshd: tonvoon@pts/3 Ss 1000 860 857 2984 1620 0.0 bash -bash @@ -79,6 +79,6 @@ Ss 1001 23783 1 3220 764 0.0 ndo2db /usr/local/nagios/bin/nd Ss 1001 23784 1 6428 4948 0.0 import_ndologsd import_ndologsd S+ 1001 9803 18955 4132 1936 0.0 ssh ssh altinity@cube02.lei.altinity S 1001 22505 22324 20256 1616 0.0 nagios ../../bin/nagios -d /usr/local/nagios/etc/nagios.cfg -S 1001 22506 22505 1676 608 0.0 check_ping /usr/local/nagios/libexec/check_ping -H 192.168.10.23 -w 3000.0,80% -c 5000.0,100% -p 1 +S 1001 22506 22505 1676 608 0.0 check_ping /usr/local/monitoring/libexec/check_ping -H 192.168.10.23 -w 3000.0,80% -c 5000.0,100% -p 1 S 1001 22507 22506 1660 492 0.0 ping /bin/ping -n -U -w 10 -c 1 192.168.10.23 R+ 1001 22508 23370 2308 680 0.0 ps ps axwo stat uid pid ppid vsz rss pcpu comm args -- cgit v1.2.3-74-g34f1 From 6141cfebf6c42873e0181105d2051143d8c11eb7 Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Tue, 21 Jan 2014 13:17:36 +0100 Subject: New default installation prefix: /usr/local Install into /usr/local instead of /usr/local/nagios by default, in order to comply with the Filesystem Hierarchy Standard (FHS) and presumably the expectations of most users. --- configure.in | 2 -- plugins/tests/var/ps_axwo.debian | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'plugins/tests') diff --git a/configure.in b/configure.in index f0c696f4..2cec17d9 100644 --- a/configure.in +++ b/configure.in @@ -12,8 +12,6 @@ AC_CANONICAL_HOST RELEASE=1 AC_SUBST(RELEASE) -AC_PREFIX_DEFAULT(/usr/local/nagios) - dnl Deprecated configure options diff --git a/plugins/tests/var/ps_axwo.debian b/plugins/tests/var/ps_axwo.debian index 38e284af..37a2d35e 100644 --- a/plugins/tests/var/ps_axwo.debian +++ b/plugins/tests/var/ps_axwo.debian @@ -79,6 +79,6 @@ Ss 1001 23783 1 3220 764 0.0 ndo2db /usr/local/nagios/bin/nd Ss 1001 23784 1 6428 4948 0.0 import_ndologsd import_ndologsd S+ 1001 9803 18955 4132 1936 0.0 ssh ssh altinity@cube02.lei.altinity S 1001 22505 22324 20256 1616 0.0 nagios ../../bin/nagios -d /usr/local/nagios/etc/nagios.cfg -S 1001 22506 22505 1676 608 0.0 check_ping /usr/local/monitoring/libexec/check_ping -H 192.168.10.23 -w 3000.0,80% -c 5000.0,100% -p 1 +S 1001 22506 22505 1676 608 0.0 check_ping /usr/local/libexec/check_ping -H 192.168.10.23 -w 3000.0,80% -c 5000.0,100% -p 1 S 1001 22507 22506 1660 492 0.0 ping /bin/ping -n -U -w 10 -c 1 192.168.10.23 R+ 1001 22508 23370 2308 680 0.0 ps ps axwo stat uid pid ppid vsz rss pcpu comm args -- cgit v1.2.3-74-g34f1