No longer use a month-by-month directory structure when HISTORY is

greater than 28

This patch updates sa1 and sa2 shell scripts in order to no longer use
the tree of directories that used to be created in the /var/log/sa
directory when HISTORY was greater than 28.
Now, when HISTORY is greater than 28, sadc is called with option -D to
create data files named saYYYYMMDD. All these files are located in the
same directory.
This patch also updates the sysstat parameters file to add a new
variable: SA_DIR, which gives the directory where sa and sar files are
saved.

Signed-off-by: Sebastien GODARD <[email protected]>

Author: sysstat

sa1.in

@@ -10,34 +10,16 @@
 # Used only if ${SYSCONFIG_DIR}/sysstat doesn't exist!
 HISTORY=0
 SADC_OPTIONS=""
-DDIR=@SA_DIR@
-DATE=`date +%d`
-CURRENTFILE=sa${DATE}
-CURRENTDIR=`date +%Y%m`
+SA_DIR=@SA_DIR@
 SYSCONFIG_DIR=@SYSCONFIG_DIR@
 umask 0022
 
 [ -r ${SYSCONFIG_DIR}/sysstat ] && . ${SYSCONFIG_DIR}/sysstat
+[ -d ${SA_DIR} ] || SA_DIR=@SA_DIR@
+
 if [ ${HISTORY} -gt 28 ]
 then
-	cd ${DDIR} || exit 1
-	[ -d ${CURRENTDIR} ] || mkdir -p ${CURRENTDIR}
-	# If ${CURRENTFILE} exists and is a regular file, then make sure
-       	# the file was modified this day (and not e.g. month ago)
-	# and move it to ${CURRENTDIR}
-	[ ! -L ${CURRENTFILE} ] &&
-		[ -f ${CURRENTFILE} ] &&
-		[ "`date +%Y%m%d -r ${CURRENTFILE}`" = "${CURRENTDIR}${DATE}" ] &&
-		mv -f ${CURRENTFILE} ${CURRENTDIR}/${CURRENTFILE}
-	touch ${CURRENTDIR}/${CURRENTFILE}
-	# Remove the "compatibility" link and recreate it to point to
-	# the (new) current file
-	rm -f ${CURRENTFILE}
-	ln -s ${CURRENTDIR}/${CURRENTFILE} ${CURRENTFILE}
-else
-	# If ${CURRENTFILE} exists, is a regular file and is from a previous
-	# month then delete it so that it is recreated by sadc afresh
-	[ -f ${CURRENTFILE} ] && [ "`date +%Y%m -r ${CURRENTFILE}`" -lt "${CURRENTDIR}" ] && rm -f ${CURRENTFILE}
+	SADC_OPTIONS="${SADC_OPTIONS} -D"
 fi
 
 ENDIR=@SA_LIB_DIR@
@@ -48,8 +30,7 @@ then
 # Note: Stats are written at the end of previous file *and* at the
 # beginning of the new one (when there is a file rotation) only if
 # outfile has been specified as '-' on the command line...
-	exec ${ENDIR}/sadc -F -L ${SADC_OPTIONS} 1 1 -
+	exec ${ENDIR}/sadc -F -L ${SADC_OPTIONS} 1 1 ${SA_DIR}
 else
-	exec ${ENDIR}/sadc -F -L ${SADC_OPTIONS} $* -
+	exec ${ENDIR}/sadc -F -L ${SADC_OPTIONS} $* ${SA_DIR}
 fi
-

sa2.in

@@ -9,55 +9,37 @@ S_TIME_FORMAT=ISO ; export S_TIME_FORMAT
 umask 0022
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-# Add a trailing slash so that 'find' can go through this directory if it's a symlink
-DDIR=@SA_DIR@/
+SA_DIR=@SA_DIR@
 SYSCONFIG_DIR=@SYSCONFIG_DIR@
-YESTERDAY=@YESTERDAY@
-DATE=`date ${YESTERDAY} +%d`
-CURRENTFILE=sa${DATE}
-CURRENTRPT=sar${DATE}
 HISTORY=@HISTORY@
 COMPRESSAFTER=@COMPRESSAFTER@
 ZIP="@ZIP@"
+YESTERDAY=@YESTERDAY@
+DATE=`date ${YESTERDAY} +%d`
+
 [ -r ${SYSCONFIG_DIR}/sysstat ] && . ${SYSCONFIG_DIR}/sysstat
+[ -d ${SA_DIR} ] || SA_DIR=@SA_DIR@
+
 if [ ${HISTORY} -gt 28 ]
 then
-	CURRENTDIR=`date ${YESTERDAY} +%Y%m`
-	cd ${DDIR} || exit 1
-	[ -d ${CURRENTDIR} ] || mkdir -p ${CURRENTDIR}
-	# Check if ${CURRENTFILE} is the correct file created at ${DATE}
-	# Note: using `-ge' instead of `=' since the file could have
-	# the next day time stamp because of the file rotating feature of sadc
-	[ -f ${CURRENTFILE} ] &&
-		[ "`date +%Y%m%d -r ${CURRENTFILE}`" -ge "${CURRENTDIR}${DATE}" ] || exit 0
-	# If the file is a regular file, then move it to ${CURRENTDIR}
-	[ ! -L ${CURRENTFILE} ] &&
-		mv -f ${CURRENTFILE} ${CURRENTDIR}/${CURRENTFILE} &&
-			ln -s ${CURRENTDIR}/${CURRENTFILE} ${CURRENTFILE}
-	touch ${CURRENTDIR}/${CURRENTRPT}
-	# Remove the "compatibility" link and recreate it to point to
-	# the (new) current file
-	rm -f ${CURRENTRPT}
-	ln -s ${CURRENTDIR}/${CURRENTRPT} ${CURRENTRPT}
-	CURRENTDIR=${DDIR}/${CURRENTDIR}
-else
-	CURRENTDIR=${DDIR}
+	DATE=`date ${YESTERDAY} +%Y%m%d`
 fi
-RPT=${CURRENTDIR}/${CURRENTRPT}
+CURRENTFILE=sa${DATE}
+CURRENTRPT=sar${DATE}
+
+RPT=${SA_DIR}/${CURRENTRPT}
+DFILE=${SA_DIR}/${CURRENTFILE}
 ENDIR=@bindir@
-DFILE=${CURRENTDIR}/${CURRENTFILE}
+
 [ -f "$DFILE" ] || exit 0
 cd ${ENDIR}
-[ -L ${RPT} ] && rm -f ${RPT}
 ${ENDIR}/sar $* -f ${DFILE} > ${RPT}
-find ${DDIR} \( -name 'sar??' -o -name 'sa??' -o -name 'sar??.xz' -o -name 'sa??.xz' -o -name 'sar??.gz' -o -name 'sa??.gz' -o -name 'sar??.bz2' -o -name 'sa??.bz2' \) \
+
+find ${SA_DIR} \( -name 'sar??' -o -name 'sa??' -o -name 'sar??.xz' -o -name 'sa??.xz' -o -name 'sar??.gz' -o -name 'sa??.gz' -o -name 'sar??.bz2' -o -name 'sa??.bz2' \) \
+	-mtime +"${HISTORY}" -exec rm -f {} \;
+find ${SA_DIR} \( -name 'sar????????' -o -name 'sa????????' -o -name 'sar????????.xz' -o -name 'sa????????.xz' -o -name 'sar????????.gz' -o -name 'sa????????.gz' -o -name 'sar????????.bz2' -o -name 'sa????????.bz2' \) \
 	-mtime +"${HISTORY}" -exec rm -f {} \;
-find ${DDIR} \( -name 'sar??' -o -name 'sa??' \) -type f -mtime +"${COMPRESSAFTER}" \
+find ${SA_DIR} \( -name 'sar??' -o -name 'sa??' -o -name 'sar????????' -o -name 'sa????????' \) -type f -mtime +"${COMPRESSAFTER}" \
 	-exec ${ZIP} {} \; > /dev/null 2>&1
-# Remove broken links
-for f in `find ${DDIR} \( -name 'sar??' -o -name 'sa??' \) -type l`; do
-	[ -e $f ] || rm -f $f
-done
-cd ${DDIR}
-rmdir [0-9]????? > /dev/null 2>&1
 exit 0
+

sysstat.sysconfig.in

@@ -12,3 +12,6 @@ COMPRESSAFTER=@COMPRESSAFTER@
 # which are used for the generation of log files.
 SADC_OPTIONS="@COLLECT_ALL@"
 
+# Directory where sa and sar files are saved.
+SA_DIR=@SA_DIR@
+