--- ./src/pmlogger/pmlogger_daily.sh 2013-12-05 16:39:00.000000000 -0500 +++ /usr/libexec/pcp/bin/pmlogger_daily 2014-01-07 16:37:21.000000000 -0500 @@ -106,6 +106,7 @@ -c control pmlogger control file -k discard remove archives after "discard" days -m addresses send daily NOTICES entries to email addresses + -M do not run pmlogger_merge -N show-me mode, no operations performed -o (old style) merge logs only from yesterday [default is to merge all possible logs before today] @@ -131,8 +132,9 @@ OFLAG=false TRACE=0 RFLAG=false +DOMERGE=true -while getopts c:k:m:Nors:t:Vx:X:Y:? c +while getopts c:k:m:MNors:t:Vx:X:Y:? c do case $c in @@ -152,6 +154,8 @@ N) SHOWME=true MYARGS="$MYARGS -N" ;; + M) DOMERGE=false + ;; o) OFLAG=true ;; r) RFLAG=true @@ -704,7 +708,7 @@ fi fi rm -f $tmp/skip - if [ ! -s $tmp/list ] + if [ ! -s $tmp/list -o $DOMERGE == 'false' ] then if $VERBOSE then