[Nagiosplug-checkins] CVS: nagiosplug configure.in,1.75,1.76

Ton Voon tonvoon at users.sourceforge.net
Mon Apr 7 15:54:03 CEST 2003
Previous message: [Nagiosplug-checkins] CVS: nagiosplug/plugins check_snmp.c,1.24,1.24.2.1
Next message: [Nagiosplug-checkins] CVS: nagiosplug/plugins Makefile.am,1.24,1.25 check_nagios.c,1.6,1.7 check_procs.c,1.12,1.13 check_vsz.c,1.7,NONE
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Update of /cvsroot/nagiosplug/nagiosplug
In directory sc8-pr-cvs1:/tmp/cvs-serv29121

Modified Files:
	configure.in 
Log Message:
Souped up check_procs with different metrics


Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -r1.75 -r1.76
*** configure.in	1 Apr 2003 04:00:21 -0000	1.75
--- configure.in	7 Apr 2003 22:53:46 -0000	1.76
***************
*** 623,633 ****
  	egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
  then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
! 	ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid ppid comm args'"
  	ac_cv_ps_format="%s %d %d %s %n"
- 	ac_cv_vsz_command="$PATH_TO_PS -weo 'vsz comm'"
- 	ac_cv_vsz_format="%d %s"
- 	ac_cv_rss_command="$PATH_TO_PS -weo 'rss comm'"
- 	ac_cv_rss_format="%d %s"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
--- 623,629 ----
  	egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
  then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
! 	ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid ppid vsz rss pcpu comm args'"
  	ac_cv_ps_format="%s %d %d %s %n"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
***************
*** 637,647 ****
  	egrep -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PPID"] >/dev/null
  then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
! 	ac_cv_ps_command="$PATH_TO_PS waxco 'state uid ppid command command'"
  	ac_cv_ps_format="%s %d %d %s %n"
- 	ac_cv_vsz_command="$PATH_TO_PS waxco 'vsz command'"
- 	ac_cv_vsz_format="%d %s"
- 	ac_cv_rss_command="$PATH_TO_PS waxco 'rss command'"
- 	ac_cv_rss_format="%d %s"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
--- 633,639 ----
  	egrep -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PPID"] >/dev/null
  then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
! 	ac_cv_ps_command="$PATH_TO_PS waxco 'state uid ppid vsz rss pcpu command command'"
  	ac_cv_ps_format="%s %d %d %s %n"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
***************
*** 651,661 ****
  	egrep -i ["^S +COMMAND +VSZ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
  then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
! 	ac_cv_ps_command="$PATH_TO_PS waxno 'state uid ppid comm args'"
  	ac_cv_ps_format="%s %d %d %s %n"
- 	ac_cv_vsz_command="$PATH_TO_PS waxno 'vsz comm'"
- 	ac_cv_vsz_format="%d %s"
- 	ac_cv_rss_command="$PATH_TO_PS waxno 'rss comm'"
- 	ac_cv_rss_format="%d %s"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
--- 643,649 ----
  	egrep -i ["^S +COMMAND +VSZ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
  then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
! 	ac_cv_ps_command="$PATH_TO_PS waxno 'state uid ppid vsz rss pcpu comm args'"
  	ac_cv_ps_format="%s %d %d %s %n"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
***************
*** 666,676 ****
  	egrep -i ["^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)|(VSZ)|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND"] >/dev/null
  then
! 	ac_cv_ps_varlist="[&procuid,&procppid,procstat,&pos,procprog]"
  	ac_cv_ps_command="$PATH_TO_PS -laxnwww"
! 	ac_cv_ps_format="%*s %d %*s %d %*s %*s %*s %*s %*s %*s %s %*s %*s %n%s"
! 	ac_cv_vsz_command="$PATH_TO_PS laxnwww"
! 	ac_cv_vsz_format="%*s %*s %*s %*s %*s %*s %*s %d"
! 	ac_cv_rss_command="$PATH_TO_PS laxnwww"
! 	ac_cv_rss_format="%*s %*s %*s %*s %*s %*s %*s %*s %d"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
--- 654,660 ----
  	egrep -i ["^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)|(VSZ)|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND"] >/dev/null
  then
! 	ac_cv_ps_varlist="[&procuid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]"
  	ac_cv_ps_command="$PATH_TO_PS -laxnwww"
! 	ac_cv_ps_format="%*s %d %*s %d %*s %*s %*s %d %d %*s %s %*s %*s %n%s"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
***************
*** 683,693 ****
  	egrep -i ["^ *F(LAGS)? +UID +PID +PPID +PRI +NI +(VSZ)|(SIZE) +RSS +WCHAN +STAT? TTY +TIME +COMMAND"] >/dev/null
  then
! 	ac_cv_ps_varlist="[&procuid,&procppid,procstat,&pos,procprog]"
  	ac_cv_ps_command="$PATH_TO_PS laxnwww"
! 	ac_cv_ps_format="%*s %d %*s %d %*s %*s %*s %*s %*s %s %*s %*s %n%s"
! 	ac_cv_vsz_command="$PATH_TO_PS laxnwww"
! 	ac_cv_vsz_format="%*s %*s %*s %*s %*s %*s %d"
! 	ac_cv_rss_command="$PATH_TO_PS laxnwww"
! 	ac_cv_rss_format="%*s %*s %*s %*s %*s %*s %*s %d"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
--- 667,673 ----
  	egrep -i ["^ *F(LAGS)? +UID +PID +PPID +PRI +NI +(VSZ)|(SIZE) +RSS +WCHAN +STAT? TTY +TIME +COMMAND"] >/dev/null
  then
! 	ac_cv_ps_varlist="[&procuid,&procppid,procstat,&procvsz,&procrss,&pos,procprog]"
  	ac_cv_ps_command="$PATH_TO_PS laxnwww"
! 	ac_cv_ps_format="%*s %d %*s %d %*s %*s %d %d %*s %s %*s %*s %n%s"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
***************
*** 697,707 ****
  	egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
  then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
! 	ac_cv_ps_command="$PATH_TO_PS -axo 'stat uid ppid comm args'"
  	ac_cv_ps_format="%s %d %d %s %n"
- 	ac_cv_vsz_command="$PATH_TO_PS -axo 'vsz comm'"
- 	ac_cv_vsz_format="%d %s"
- 	ac_cv_rss_command="$PATH_TO_PS -axo 'rss comm'"
- 	ac_cv_rss_format="%d %s"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
--- 677,683 ----
  	egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
  then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
! 	ac_cv_ps_command="$PATH_TO_PS -axo 'stat uid ppid vsz rss pcpu comm args'"
  	ac_cv_ps_format="%s %d %d %s %n"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
***************
*** 711,721 ****
  	egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
  then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
! 	ac_cv_ps_command="$PATH_TO_PS -ao 'stat uid ppid comm args'"
  	ac_cv_ps_format="[["%s%*[ +] %d %d %s %n"]]"
- 	ac_cv_vsz_command="$PATH_TO_PS -ao 'vsz comm'"
- 	ac_cv_vsz_format="%d %s"
- 	ac_cv_rss_command="$PATH_TO_PS -ao 'rss comm'"
- 	ac_cv_rss_format="%d %s"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
--- 687,693 ----
  	egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
  then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
! 	ac_cv_ps_command="$PATH_TO_PS -ao 'stat uid ppid vsz rss pcpu comm args'"
  	ac_cv_ps_format="[["%s%*[ +] %d %d %s %n"]]"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
***************
*** 724,734 ****
  	egrep -i ["^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
  then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
! 	ac_cv_ps_command="$PATH_TO_PS -eo 's uid ppid comm args'"
  	ac_cv_ps_format="%s %d %d %s %n"
- 	ac_cv_vsz_command="$PATH_TO_PS -eo 'vsz comm'"
- 	ac_cv_vsz_format="%d %s"
- 	ac_cv_rss_command="$PATH_TO_PS -eo 'rss comm'"
- 	ac_cv_rss_format="%d %s"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
--- 696,702 ----
  	egrep -i ["^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
  then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
! 	ac_cv_ps_command="$PATH_TO_PS -eo 's uid ppid vsz rss pcpu comm args'"
  	ac_cv_ps_format="%s %d %d %s %n"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
***************
*** 737,747 ****
  	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
  then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
! 	ac_cv_ps_command="$PATH_TO_PS -Ao 's uid ppid comm args'"
  	ac_cv_ps_format="%s %d %d %s %n"
- 	ac_cv_vsz_command="$PATH_TO_PS -Ao 'vsz comm'"
- 	ac_cv_vsz_format="%d %s"
- 	ac_cv_rss_command="$PATH_TO_PS -Ao 'rss comm'"
- 	ac_cv_rss_format="%d %s"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
--- 705,711 ----
  	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
  then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
! 	ac_cv_ps_command="$PATH_TO_PS -Ao 's uid ppid vsz rss pcpu comm args'"
  	ac_cv_ps_format="%s %d %d %s %n"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
***************
*** 750,760 ****
  	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
  then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
! 	ac_cv_ps_command="$PATH_TO_PS -Ao 'status uid ppid comm args'"
  	ac_cv_ps_format="%s %d %d %s %n"
- 	ac_cv_vsz_command="$PATH_TO_PS -Ao 'vsz comm'"
- 	ac_cv_vsz_format="%d %s"
- 	ac_cv_rss_command="$PATH_TO_PS -Ao 'rss comm'"
- 	ac_cv_rss_format="%d %s"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
--- 714,720 ----
  	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
  then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
! 	ac_cv_ps_command="$PATH_TO_PS -Ao 'status uid ppid vsz rss pcpu comm args'"
  	ac_cv_ps_format="%s %d %d %s %n"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
***************
*** 763,773 ****
  	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
  then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
! 	ac_cv_ps_command="$PATH_TO_PS -Ao 'state uid ppid comm args'"
  	ac_cv_ps_format="%s %d %d %s %n"
- 	ac_cv_vsz_command="$PATH_TO_PS -Ao 'vsz comm'"
- 	ac_cv_vsz_format="%d %s"
- 	ac_cv_rss_command="$PATH_TO_PS -Ao 'rss comm'"
- 	ac_cv_rss_format="%d %s"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
--- 723,729 ----
  	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
  then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
! 	ac_cv_ps_command="$PATH_TO_PS -Ao 'state uid ppid vsz rss pcpu comm args'"
  	ac_cv_ps_format="%s %d %d %s %n"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
***************
*** 777,787 ****
  	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
  then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
! 	ac_cv_ps_command="$PATH_TO_PS -ao 'state uid ppid command args'"
  	ac_cv_ps_format="%s %d %d %s %n"
- 	ac_cv_vsz_command="$PATH_TO_PS -ao 'vsz command'"
- 	ac_cv_vsz_format="%d %s"
- 	ac_cv_rss_command="$PATH_TO_PS -ao 'rss command'"
- 	ac_cv_rss_format="%d %s"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
--- 733,739 ----
  	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PPID +[RGSCOMDNA]+"] >/dev/null
  then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
! 	ac_cv_ps_command="$PATH_TO_PS -ao 'state uid ppid vsz rss pcpu command args'"
  	ac_cv_ps_format="%s %d %d %s %n"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
***************
*** 791,801 ****
  	egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
  then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&pos,procprog]"
  	ac_cv_ps_command="$PATH_TO_PS -el"
! 	ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
! 	ac_cv_vsz_command="$PATH_TO_PS -el"
! 	ac_cv_vsz_format="%*s %*s %*s %*s %d"
! 	ac_cv_rss_command="$PATH_TO_PS -el"
! 	ac_cv_rss_format="%*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %d"
  	AC_MSG_RESULT([$ac_cv_ps_command])
  
--- 743,749 ----
  	egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
  then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&pos,procprog]"
  	ac_cv_ps_command="$PATH_TO_PS -el"
! 	ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %d %d %*s %*s %*s %n%s"
  	AC_MSG_RESULT([$ac_cv_ps_command])
  
***************
*** 807,814 ****
  	ac_cv_ps_command="$PATH_TO_PS -el"
  	ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
- 	ac_cv_vsz_command="$PATH_TO_PS -el"
- 	ac_cv_vsz_format="%*s %*s %*s %*s %d"
- 	ac_cv_rss_command="$PATH_TO_PS -el"
- 	ac_cv_rss_format="%*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %d"
  	AC_MSG_RESULT([$ac_cv_ps_command])
  
--- 755,758 ----
***************
*** 822,829 ****
  	ac_cv_ps_command="$PATH_TO_PS -el"
  	ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
- 	ac_cv_vsz_command="$PATH_TO_PS -el"
- 	ac_cv_vsz_format="%*s %*s %*s %*s %*s %*s %*s %*s %*s %d"
- 	ac_cv_rss_command="$PATH_TO_PS -el"
- 	ac_cv_rss_format="%*s %*s %*s %*s %*s %*s %*s %*s %*s %d"
  	AC_MSG_RESULT([$ac_cv_ps_command])
  
--- 766,769 ----
***************
*** 832,858 ****
  	egrep -i ["^ *F +UID +PID +PPID +PRI +NI +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND"] >/dev/null
  then
! 	ac_cv_ps_varlist="[&procuid,&procppid,procstat,&pos,procprog]"
  	ac_cv_ps_command="$PATH_TO_PS glaxen"
! 	ac_cv_ps_format="%*s %d %*s %d %*s %*s %*s %*s %*s %s %*s %*s %n%s"
! 	ac_cv_vsz_command="$PATH_TO_PS glaxen"
! 	ac_cv_vsz_format="%*s %*s %*s %*s %*s %*s %d"
! 	ac_cv_rss_command="$PATH_TO_PS glaxen"
! 	ac_cv_rss_format="%*s %*s %*s %*s %*s %*s %*s %d"
  	AC_MSG_RESULT([$ac_cv_ps_command])
  
  dnl MacOSX / Darwin
  dnl TODO: MacOSX has commands with spaces which will cause problems to PS_FORMAT
! dnl STAT      VSZ    RSS   UID USER     PPID UCOMM            COMMAND
! dnl Ss       1308    272     0 root        0 init             /sbin/init
! elif ps waxo 'state vsz rss uid user ppid ucomm command' 2>/dev/null | \
! 	egrep -i ["^STAT +VSZ +RSS +UID +USER +PPID +UCOMM +COMMAND"] >/dev/null
! then
! 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,procprog,&pos]"
! 	ac_cv_ps_command="$PATH_TO_PS waxo 'state uid ppid ucomm command'"
! 	ac_cv_ps_format="%s %d %d %s %n"
! 	ac_cv_vsz_command="$PATH_TO_PS waxco 'vsz command'"
! 	ac_cv_vsz_format="%d %s"
! 	ac_cv_rss_command="$PATH_TO_PS waxco 'rss command'"
! 	ac_cv_rss_format="%d %s"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
--- 772,791 ----
  	egrep -i ["^ *F +UID +PID +PPID +PRI +NI +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND"] >/dev/null
  then
! 	ac_cv_ps_varlist="[&procuid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]"
  	ac_cv_ps_command="$PATH_TO_PS glaxen"
! 	ac_cv_ps_format="%*s %d %*s %d %*s %*s %d %d %*s %s %*s %*s %n%s"
  	AC_MSG_RESULT([$ac_cv_ps_command])
  
  dnl MacOSX / Darwin
  dnl TODO: MacOSX has commands with spaces which will cause problems to PS_FORMAT
! dnl Some truncation will happen in UCOMM column
! dnl STAT      VSZ    RSS   UID  PPID %CPU UCOMM            COMMAND
! dnl Ss      52756  22496   501     1   6.9 Window Manager   /System/Library/CoreServices/WindowServer -daemon
! elif ps wwaxo 'state vsz rss uid ppid pcpu ucomm command' 2>/dev/null | \
! 	egrep -i ["^STAT +VSZ +RSS +UID +PPID +%CPU +UCOMM +COMMAND"] >/dev/null
! then
! 	ac_cv_ps_command="$PATH_TO_PS wwaxo 'state vsz rss uid ppid pcpu ucomm command'"
! 	ac_cv_ps_varlist="[procstat,&procvsz,&procrss,&procuid,&procppid,&procpcpu,procprog,&pos]"
! 	ac_cv_ps_format="%s %d %d %d %d %f %s %n"
  	EXTRAS="$EXTRAS check_nagios"
  	AC_MSG_RESULT([$ac_cv_ps_command])
***************
*** 865,874 ****
  	ac_cv_ps_command="$PATH_TO_PS -Al"
  	ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
! 	if ps -Ao 'vsz comm' 2>/dev/null | \
! 		egrep -i ["^ *VSZ +COMMAND"] >/dev/null
! 	then
! 		ac_cv_vsz_command="$PATH_TO_PS -Ao 'vsz comm'"
! 		ac_cv_vsz_format="%*s %d"
! 	fi
  	AC_MSG_RESULT([$ac_cv_ps_command])
  
--- 798,807 ----
  	ac_cv_ps_command="$PATH_TO_PS -Al"
  	ac_cv_ps_format="%*s %s %d %*s %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
! 	#if ps -Ao 'vsz comm' 2>/dev/null | \
! 	#	egrep -i ["^ *VSZ +COMMAND"] >/dev/null
! 	#then
! 	#	ac_cv_vsz_command="$PATH_TO_PS -Ao 'vsz comm'"
! 	#	ac_cv_vsz_format="%*s %d"
! 	#fi
  	AC_MSG_RESULT([$ac_cv_ps_command])
  
***************
*** 883,894 ****
  AC_DEFINE_UNQUOTED(PS_FORMAT,"$ac_cv_ps_format",
  	[Format string for scanning ps output in check_procs])
- AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$ac_cv_vsz_command",
- 	[Verbatim command to execute for ps in check_vsz])
- AC_DEFINE_UNQUOTED(VSZ_FORMAT,"$ac_cv_vsz_format",
- 	[Format string for scanning ps output in check_vsz])
- AC_DEFINE_UNQUOTED(RSS_COMMAND,"$ac_cv_rss_command",
- 	[Verbatim command to execute for ps in check_rss])
- AC_DEFINE_UNQUOTED(RSS_FORMAT,"$ac_cv_rss_format",
- 	[Format string for scanning ps output in check_rss])
  
  AC_PATH_PROG(PATH_TO_DF,df)
--- 816,819 ----
Previous message: [Nagiosplug-checkins] CVS: nagiosplug/plugins check_snmp.c,1.24,1.24.2.1
Next message: [Nagiosplug-checkins] CVS: nagiosplug/plugins Makefile.am,1.24,1.25 check_nagios.c,1.6,1.7 check_procs.c,1.12,1.13 check_vsz.c,1.7,NONE
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Commits mailing list