summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--configure.in32
-rw-r--r--plugins/check_procs.c2
3 files changed, 12 insertions, 25 deletions
diff --git a/NEWS b/NEWS
index 310c08b..184d4ec 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
1This file documents the major additions and syntax changes between releases. 1This file documents the major additions and syntax changes between releases.
2 2
3?? ?? 31.4.7 ??
4 check_procs uses /usr/ucb/ps if available - fixes pst3 problems on Solaris
4 Fixed MKINSTALLDIRS problem in po/ 5 Fixed MKINSTALLDIRS problem in po/
5 Root plugins installed with world executable 6 Root plugins installed with world executable
6 ./configure now detects if possible to compile check_mysql 7 ./configure now detects if possible to compile check_mysql
diff --git a/configure.in b/configure.in
index b0d1c97..3b8db84 100644
--- a/configure.in
+++ b/configure.in
@@ -493,30 +493,16 @@ if test -n "$PS_COMMAND" && test -n "$PS_FORMAT" && test -n "$PS_COLS" && test -
493 ac_cv_ps_cols="$PS_COLS" 493 ac_cv_ps_cols="$PS_COLS"
494 AC_MSG_RESULT([(command-line) $ac_cv_ps_command]) 494 AC_MSG_RESULT([(command-line) $ac_cv_ps_command])
495 495
496dnl Now using the pst3/kmem hack for solaris systems to avoid truncation 496dnl Using /usr/ucb/ps on Solaris systems, to avoid truncation
497elif test "$ac_cv_uname_s" = "SunOS"; then 497dnl Limitation that command name is not available
498 # 498elif test "$ac_cv_uname_s" = "SunOS" && /usr/ucb/ps -alxwwn 2>/dev/null | \
499 # this is a very, very ugly hack, to hardcode the location for plugins 499 egrep -i ["^ *F +UID +PID +PPID +%C +PRI +NI +SZ +RSS +WCHAN +S +TT +TIME +COMMAND"] > /dev/null
500 # 500then
501 if test "$libexecdir" = '${exec_prefix}/libexec'; then 501 ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procpcpu,&procvsz,&procrss,procstat,&pos]"
502 if test "$exec_prefix" = "NONE"; then 502 ac_cv_ps_command="/usr/ucb/ps -alxwwn"
503 if test "$prefix" = "NONE"; then 503 ac_cv_ps_format=["%*s %d %d %d %d %*d %*d %d %d%*[ 0123456789abcdef]%[OSRZT]%*s %*s %n"]
504 pst3="$ac_default_prefix/libexec/pst3"
505 else
506 pst3="$prefix/libexec/pst3"
507 fi
508 else
509 pst3="$exec_prefix/libexec/pst3"
510 fi
511 else
512 pst3="$libexecdir/pst3"
513 fi
514 ac_cv_ps_command="$pst3"
515 ac_cv_ps_format="%s %d %d %d %d %f %s %n"
516 ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
517 ac_cv_ps_cols=8 504 ac_cv_ps_cols=8
518 AC_MSG_RESULT([using nagios-plugins internal ps for solaris]) 505 AC_MSG_RESULT([$ac_cv_ps_command])
519 EXTRAS_ROOT="$EXTRAS_ROOT pst3"
520 506
521dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo. 507dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo.
522dnl so test for this first... 508dnl so test for this first...
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index da7e9f0..2e28328 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -200,7 +200,7 @@ main (int argc, char **argv)
200 procseconds = convert_to_seconds(procetime); 200 procseconds = convert_to_seconds(procetime);
201 201
202 if (verbose >= 3) 202 if (verbose >= 3)
203 printf ("%d %d %d %d %d %d %.2f %s %s %s %s\n", 203 printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n",
204 procs, procuid, procvsz, procrss, 204 procs, procuid, procvsz, procrss,
205 procpid, procppid, procpcpu, procstat, 205 procpid, procppid, procpcpu, procstat,
206 procetime, procprog, procargs); 206 procetime, procprog, procargs);